Kolab Groupware OBS

libkolabxml.spec Changed

@@ -1,3 +1,8 @@
+# Needed for opensuse build system
+%if 0%{?opensuse_bs}
+#!BuildIgnore:  fedora-logos-httpd
+%endif
+
 %{?!mono_arches: %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64}
 
 %ifarch %{mono_arches}
@@ -49,7 +54,7 @@
 Name:           libkolabxml
 %endif
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kolab XML format collection parser library
 
 Group:          System Environment/Libraries
@@ -184,6 +189,7 @@
 Summary:        PHP bindings for libkolabxml
 Group:          System Environment/Libraries
 Requires:       libkolabxml%{?_isa} = %{version}
+Requires:       php-kolab
 %if 0%{?rhel} > 5 || 0%{?fedora} > 15
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
@@ -290,11 +296,6 @@
 %if 0%{?with_php} > 0
 mkdir -p %{buildroot}/%{_datadir}/php
 mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/php/kolabformat.php
-
-mkdir -p %{buildroot}/%{php_inidir}/
-cat >%{buildroot}/%{php_inidir}/kolabformat.ini <<EOF
-extension=kolabformat.so
-EOF
 %endif
 
 %check
@@ -353,7 +354,6 @@
 %if 0%{?with_php} > 0
 %files -n php-kolabformat
 %defattr(-,root,root,-)
-%config(noreplace) %{php_inidir}/kolabformat.ini
 %{_datadir}/php/kolabformat.php
 %{php_extdir}/kolabformat.so
 %if 0%{?suse_version}
@@ -372,6 +372,10 @@
 %endif
 
 %changelog
+* Mon Jan 13 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.0.1-2
+- Require php-kolab for php-kolabformat, and void
+  /etc/php.d/kolabformat.ini (#2667)
+
 * Wed Oct 30 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.0.1-1
 - New upstream release

debian-Debian_6.0.control Changed

debian.control Changed

libkolabxml.dsc Changed

Changes of Revision 36