php-phalcon: better patch

3 files changed, 39 insertions, 47 deletions

diff --git a/2793.patch b/2793.patch
new file mode 100644
index 0000000..3188d73
--- /dev/null
+++ b/2793.patch
@@ -0,0 +1,36 @@
+From 1d6f796b16a62c4334ea134310a80833cd2fee7e Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Sun, 7 Sep 2014 17:43:26 +0200
+Subject: [PATCH] switch headers + avoid duplicate definition
+
+---
+ build/_resource/config/phalcon_c_priority_files.php | 4 ++--
+ build/_resource/config/phalcon_c_skip_files.php     | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/build/_resource/config/phalcon_c_priority_files.php b/build/_resource/config/phalcon_c_priority_files.php
+index f01c403..5414dee 100644
+--- a/build/_resource/config/phalcon_c_priority_files.php
++++ b/build/_resource/config/phalcon_c_priority_files.php
+@@ -3,8 +3,8 @@
+ 
+ return array(
+     // Header files
+-    'assets/filters/jsminifier.h',
+-    'assets/filters/cssminifier.h',
++    'assets/filters/nojsminifier.h',
++    'assets/filters/nocssminifier.h',
+     'mvc/model/query/parser.h',
+     'mvc/model/query/scanner.h',
+     'mvc/model/query/phql.h',
+diff --git a/build/_resource/config/phalcon_c_skip_files.php b/build/_resource/config/phalcon_c_skip_files.php
+index 613dd1b..a7ef989 100644
+--- a/build/_resource/config/phalcon_c_skip_files.php
++++ b/build/_resource/config/phalcon_c_skip_files.php
+@@ -11,4 +11,6 @@
+     'annotations/base.c',
+     'mvc/model/query/base.c',
+     'mvc/view/engine/volt/base.c',
++    'assets/filters/jsminifier.h',
++    'assets/filters/cssminifier.h',
+ );
diff --git a/cphalcon-rpm.patch b/cphalcon-rpm.patch
deleted file mode 100644
index cd8d0cc..0000000
--- a/cphalcon-rpm.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up ext/assets/filters/cssmin.c.rpm ext/assets/filters/cssmin.c
---- ext/assets/filters/cssmin.c.rpm	2014-09-07 09:53:18.975164612 +0200
-+++ ext/assets/filters/cssmin.c	2014-09-07 09:53:23.879188187 +0200
-@@ -18,11 +18,7 @@
- */
- 
- #include "assets/filters/cssmin.h"
--#ifdef PHALCON_NON_FREE
--#include "assets/filters/cssminifier.h"
--#else
- #include "assets/filters/nocssminifier.h"
--#endif
- #include "assets/filterinterface.h"
- 
- #include "kernel/main.h"
-diff -up ext/assets/filters/jsmin.c.rpm ext/assets/filters/jsmin.c
---- ext/assets/filters/jsmin.c.rpm	2014-09-07 09:53:10.325123035 +0200
-+++ ext/assets/filters/jsmin.c	2014-09-07 09:53:29.054213063 +0200
-@@ -18,11 +18,7 @@
- */
- 
- #include "assets/filters/jsmin.h"
--#ifdef PHALCON_NON_FREE
--#include "assets/filters/jsminifier.h"
--#else
- #include "assets/filters/nojsminifier.h"
--#endif
- #include "assets/filterinterface.h"
- 
- #include "kernel/main.h"
-diff -up build/_resource/config/phalcon_c_priority_files.php.rpm build/_resource/config/phalcon_c_priority_files.php
---- build/_resource/config/phalcon_c_priority_files.php.rpm	2014-09-07 09:58:44.109729141 +0200
-+++ build/_resource/config/phalcon_c_priority_files.php	2014-09-07 09:58:48.428749943 +0200
-@@ -3,8 +3,8 @@
- 
- return array(
-     // Header files
--    'assets/filters/jsminifier.h',
--    'assets/filters/cssminifier.h',
-+    'assets/filters/nojsminifier.h',
-+    'assets/filters/nocssminifier.h',
-     'mvc/model/query/parser.h',
-     'mvc/model/query/scanner.h',
-     'mvc/model/query/phql.h',
diff --git a/php-phalcon.spec b/php-phalcon.spec
index 0fba45b..93a38d7 100644
--- a/php-phalcon.spec
+++ b/php-phalcon.spec
@@ -39,8 +39,7 @@ Patch1:         https://github.com/phalcon/cphalcon/pull/2772.patch
 Patch2:         https://github.com/phalcon/cphalcon/pull/2774.patch
 Patch3:         https://github.com/phalcon/cphalcon/pull/2775.patch
 Patch4:         https://github.com/vpg/cphalcon/commit/d9ded2ae91afbf9a4b1f515c18c4a99760b2df5c.patch
-# still need to drop all ref to striped non-free sources
-Patch5:         %{gh_project}-rpm.patch
+Patch5:         https://github.com/phalcon/cphalcon/pull/2793.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: %{?scl_prefix}php-devel > 5.3
@@ -96,7 +95,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 chmod 644 ext/assets/filters/*.2774
 %patch3 -p1 -b .2775
 %patch4 -p1 -b .build
-%patch5 -p0 -b .rpm
+%patch5 -p1 -b .2793
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PHALCON_VERSION/{s/.* "//;s/".*$//;p}' ext/php_phalcon.h)
@@ -234,6 +233,7 @@ rm -rf %{buildroot}
 * Sun Sep  7 2014 Remi Collet <remi@fedoraproject.org> - 1.3.2-2
 - use striped archive, without non-free sources
 - generate and use optimized sources
+- open https://github.com/phalcon/cphalcon/pull/2793
 
 * Thu Sep  4 2014 Remi Collet <remi@fedoraproject.org> - 1.3.2-1
 - initial package, version 1.3.2