[libkolabxml/f17] Correct dependency on php

Jeroen van Meeuwen kanarip at fedoraproject.org
Wed Jun 27 07:05:13 UTC 2012


commit 8161d6054405d335a6e026c8f1ee6786e5eb30f7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jun 27 08:04:58 2012 +0100

    Correct dependency on php

 libkolabxml.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libkolabxml.spec b/libkolabxml.spec
index d98eb12..52c3304 100644
--- a/libkolabxml.spec
+++ b/libkolabxml.spec
@@ -13,7 +13,7 @@
 
 Name:           libkolabxml
 Version:        0.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Kolab XML format collection parser library
 
 Group:          System Environment/Libraries
@@ -87,11 +87,11 @@ Development headers for the Kolab XML libraries.
 Summary:        PHP bindings for libkolabxml
 Group:          System Environment/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-%if 0%{?rhel} < 6
-Requires:       php-api = %{php_apiver}
-%else
+%if 0%{?rhel} > 5 || 0%{?fedora} > 15
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
+%else
+Requires:       php-api = %{php_apiver}
 %endif
 
 %description -n php-kolabformat
@@ -189,6 +189,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/_kolabformat.so
 
 %changelog
+* Wed Jun 27 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6.0-3
+- Correct dependency on php
+
 * Tue Jun 26 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6.0-2
 - Also remove xsd-utils requirement for -devel sub-package
 


More information about the scm-commits mailing list