rpms/cups/F-11 cups-str3258.patch,NONE,1.1 cups.spec,1.483,1.484

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2404

Modified Files:
	cups.spec 
Added Files:
	cups-str3258.patch 
Log Message:
* Wed Jul 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.10
- Applied patch to fix job-hold-until for remote queues (STR #3258,
  bug #497376).


cups-str3258.patch:

--- NEW FILE cups-str3258.patch ---
diff -up cups-1.4rc1/scheduler/ipp.c.str3258 cups-1.4rc1/scheduler/ipp.c
--- cups-1.4rc1/scheduler/ipp.c.str3258	2009-07-15 09:58:15.559299247 +0100
+++ cups-1.4rc1/scheduler/ipp.c	2009-07-15 09:58:47.981299548 +0100
@@ -1721,8 +1721,7 @@ add_job(cupsd_client_t  *con,		/* I - Cl
     attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
                         "job-hold-until", NULL, val);
   }
-  if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
-      !(printer->type & CUPS_PRINTER_REMOTE))
+  if (attr && strcmp(attr->values[0].string.text, "no-hold"))
   {
    /*
     * Hold job until specified time...
diff -up cups-1.4rc1/scheduler/job.c.str3258 cups-1.4rc1/scheduler/job.c
--- cups-1.4rc1/scheduler/job.c.str3258	2009-07-15 09:58:15.627173602 +0100
+++ cups-1.4rc1/scheduler/job.c	2009-07-15 09:58:47.984298957 +0100
@@ -3095,7 +3095,8 @@ get_options(cupsd_job_t *job,		/* I - Jo
 	  attr->value_tag == IPP_TAG_BEGIN_COLLECTION) /* Not yet supported */
 	continue;
 
-      if (!strncmp(attr->name, "time-", 5))
+      if (!strncmp(attr->name, "time-", 5) ||
+          !strcmp(attr->name, "job-hold-until"))
 	continue;
 
       if (!strncmp(attr->name, "job-", 4) &&


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -r1.483 -r1.484
--- cups.spec	10 Jul 2009 15:22:45 -0000	1.483
+++ cups.spec	15 Jul 2009 09:06:19 -0000	1.484
@@ -1,3 +1,6 @@
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+
 %define pre rc1
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
@@ -7,7 +10,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.8%{?dist}
+Release: 0.%{pre}.10%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -48,7 +51,8 @@ Patch24: cups-str3229.patch
 Patch25: cups-filter-debug.patch
 Patch26: cups-str3231.patch
 Patch27: cups-str3244.patch
-Patch28: cups-avahi.patch
+Patch28: cups-str3258.patch
+Patch29: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -133,7 +137,12 @@ Requires: xinetd
 Summary: Common Unix Printing System - php module
 Group: Development/Languages
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: php-common
+%if 0%{?php_zend_api}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
+%else
+Requires: php-api = %{php_apiver}
+%endif
 
 
 %description
@@ -192,7 +201,8 @@ module. 
 %patch25 -p1 -b .filter-debug
 %patch26 -p1 -b .str3231
 %patch27 -p1 -b .str3244
-#%patch28 -p1 -b .avahi
+%patch28 -p1 -b .str3258
+#%patch29 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -305,6 +315,14 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $R
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 
+# Put the php config bit into place
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
+%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini
+; Enable %{name} extension module
+extension=phpcups.so
+__EOF__
+
+
 %post
 /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
 /sbin/chkconfig --add cups || true
@@ -473,9 +491,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files php
 %defattr(-,root,root)
-%{_libdir}/php/modules/*.so
+%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
+%{php_extdir}/phpcups.so
 
 %changelog
+* Wed Jul 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.10
+- Applied patch to fix job-hold-until for remote queues (STR #3258,
+  bug #497376).
+
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> 1:1.4-0.rc1.9
+- add PHP ABI check
+- use php_extdir
+- add php configuration file (/etc/php.d/cups.ini)
+
 * Fri Jul 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.8
 - Build does not require aspell-devel (bug #510405).