[cups/f13/master] Fixed build failure due to php_zend_api macro type.

Tim Waugh twaugh at fedoraproject.org
Fri Feb 25 13:24:05 UTC 2011


commit 97ac79159aa21c45ffc3fb7a790fa5ea690a5631
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Feb 25 13:22:46 2011 +0000

    Fixed build failure due to php_zend_api macro type.

 cups.spec |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/cups.spec b/cups.spec
index c9fd1d6..0a05cd2 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -162,12 +162,8 @@ Requires: xinetd
 Summary: Common Unix Printing System - php module
 Group: Development/Languages
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%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
@@ -576,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Feb 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-6
+- Fixed build failure due to php_zend_api macro type.
+
 * Fri Feb 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-5
 - Fixed dbus notifier support for job-state-changed.
 


More information about the scm-commits mailing list