diff options
| author | Remi Collet <fedora@famillecollet.com> | 2011-12-27 17:20:35 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2011-12-27 17:20:35 +0100 |
| commit | e9aca43f53b8a090e7e8ffe20eeed179986321f3 (patch) | |
| tree | dbd006d19c854c12252cae7c7d36e03a75a3645c | |
| parent | 65608e0f8bbc0190cc1b7646f653e796c807f02b (diff) | |
cups with php 5.4
| -rw-r--r-- | cups-php54.patch | 12 | ||||
| -rw-r--r-- | cups.spec | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/cups-php54.patch b/cups-php54.patch new file mode 100644 index 0000000..4cfbf39 --- /dev/null +++ b/cups-php54.patch @@ -0,0 +1,12 @@ +diff -up cups-1.5.0/scripting/php/phpcups.c.orig cups-1.5.0/scripting/php/phpcups.c +--- cups-1.5.0/scripting/php/phpcups.c.orig 2011-12-27 16:54:21.520359399 +0100 ++++ cups-1.5.0/scripting/php/phpcups.c 2011-12-27 16:54:55.461360314 +0100 +@@ -40,7 +40,7 @@ + * PHP function list... + */ + +-function_entry phpcups_functions[] = ++zend_function_entry phpcups_functions[] = + { + PHP_FE(cups_cancel_job, NULL) + PHP_FE(cups_get_dests, NULL) @@ -77,6 +77,10 @@ Patch39: cups-ps-command-filter.patch Patch100: cups-lspp.patch +# http://www.cups.org/str.php?L3999 +Patch101: cups-php54.patch + + Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -310,6 +314,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch100 -p1 -b .lspp %endif +%patch101 -p1 -b .php54 + + sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in cp %{SOURCE5} cups-lpd.real @@ -660,6 +667,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ipptool.1.gz %changelog +* Tue Dec 27 2011 Remi Collet <remi@fedoraproject.org> 1:1.5.0-22 +- build against php 5.4 +- add patch for http://www.cups.org/str.php?L3999 + * Fri Nov 11 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-22 - Fixed trigger (bug #748841). |