Kolab Groupware OBS

libkolab.spec Changed

@@ -30,8 +30,8 @@
 Name:           libkolab
 %endif
 
-Version:        0.6
-Release:        0.1.dev20140624.git28814475%{?dist}
+Version:        0.7
+Release:        0.1.dev20150112.gitf0f953aa%{?dist}
 Summary:        Kolab Object Handling Library
 
 License:        LGPLv3+
@@ -41,12 +41,12 @@
 Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
 
 BuildRequires:  cmake
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
-BuildRequires:  kdepimlibs-devel >= 4.9
+%if 0%{?rhel} > 7 || 0%{?fedora} >= 20
+BuildRequires:  kdepimlibs-devel >= 4.11
 %else
 # Note: available within kolabsys.com infrastructure only, as being (essentially) a
 # fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel >= 4.9
+BuildRequires:  libcalendaring-devel >= 4.9.1
 %endif
 BuildRequires:  libcurl-devel
 BuildRequires:  libkolabxml-devel >= 1.0
@@ -70,12 +70,16 @@
 %endif
 Summary:        Kolab library development headers
 Requires:       libkolab%{?_isa} = %{version}
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
-BuildRequires:  kdepimlibs-devel >= 4.9
+%if 0%{?rhel} > 7 || 0%{?fedora} >= 20
+BuildRequires:  kdepimlibs-devel >= 4.11
+%if 0%{?fedora} >= 21
+# Fedora 21 has qca2 and qca, qca2 has been renamed to qca
+BuildRequires: qca
+%endif
 %else
 # Note: available within kolabsys.com infrastructure only, as being (essentially) a
 # fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel >= 4.9
+BuildRequires:  libcalendaring-devel >= 4.9.1
 %endif
 Requires:       libkolabxml-devel >= 1.0
 Requires:       php-devel
@@ -153,7 +157,7 @@
     -DBoost_NO_BOOST_CMAKE=TRUE \
     -Wno-fatal-errors -Wno-errors \
     -DINCLUDE_INSTALL_DIR=%{_includedir} \
-%if 0%{?rhel} < 7 && 0%{?fedora} < 17
+%if 0%{?rhel} < 8 && 0%{?fedora} < 20
     -DUSE_LIBCALENDARING=ON \
 %endif
     -DPHP_BINDINGS=ON \
@@ -182,6 +186,13 @@
 extension=kolabicalendar.so
 EOF
 
+# Workaround for #2050
+cat >%{buildroot}/%{php_inidir}/kolabdummy.ini <<EOF
+; Kolab libraries
+extension=dummy.so
+EOF
+
+
 touch %{buildroot}/%{python_sitearch}/kolab/__init__.py
 
 %check
@@ -204,7 +215,7 @@
 
 %files
 %{_libdir}/libkolab.so.0
-%{_libdir}/libkolab.so.0.6
+%{_libdir}/libkolab.so.0.7
 
 %if 0%{?suse_version}
 %files -n libkolab-devel
@@ -217,6 +228,7 @@
 
 %files -n php-kolab
 %config(noreplace) %{php_inidir}/kolab.ini
+%config(noreplace) %{php_inidir}/kolabdummy.ini
 %{_datadir}/%{php}/kolabcalendaring.php
 %{php_extdir}/kolabcalendaring.so
 %{_datadir}/%{php}/kolabicalendar.php
@@ -241,6 +253,12 @@
 %{python_sitearch}/kolab/shared.py*
 
 %changelog
+* Mon Feb 09 2015 Timotheus Pokorra <tp@tbits.net>
+- master is going towards 0.7
+
+* Mon Jan 12 2015 Christoph Wickert <wickert@kolabsys.com> - 0.6-0.1.dev20150112.gitf0f953aa
+- Add dummy plugin to workaround httpd reload issue (#2050)
+
 * Mon Oct 14 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.0-1
 - New upstream release

0001-Dummy-plugin-to-to-workaround-the-httpd-reload-issue.patch Added

_link Changed

_service Changed

debian.changelog Changed

debian.control Changed

debian.rules Changed

debian.tar.gz/php-kolab-kde.install Changed

debian.tar.gz/php-kolab.install Changed

debian.tar.gz/php-kolab.postinst Changed

@@ -11,6 +11,36 @@
     inidir=/etc/php5/conf.d
 fi
 
+# Dummy plugin (workaround for #2050)
+module=kolabdummy
+package=php-kolab
+inifile=${module}.ini
+priority=29
+
+if [ "$1" = "configure" ]; then
+
+	# Register new conffile with UCF
+	ucf /usr/share/php5/${module}/${inifile} ${inidir}/${inifile}
+	ucfr --force ${package} ${inidir}/${inifile}
+
+	# Move pre-extension manager conffile
+	dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.4.0~ -- "$@";
+
+	if [ -f "${inidir}/${inifile}.dpkg-new" ]; then
+	    md5sum="$(md5sum ${inidir}/${inifile}.dpkg-new | sed -e 's/ .*//')"
+	    old_md5sum="$(md5sum ${inidir}/${inifile} | sed -e 's/ .*//')"
+	    if [ "$md5sum" = "$old_md5sum" ]; then
+		mv "${inidir}/${inifile}.dpkg-new" "${inidir}/${inifile}"
+	    fi
+	fi
+
+	# Enable the module
+    if [ -x "$(which php5enmod 2>/dev/null)" ]; then
+    	php5enmod ${module}/${priority:-19}
+    fi
+fi
+# End dummy plugin
+
 module=kolab
 package=php-${module}
 inifile=${module}.ini
@@ -39,4 +69,12 @@
     fi
 fi
 
+if [ "$1" = "configure" ]; then
+
+	# make sure that kolabformat.so is loaded after dummy.so, see #2050
+	sed -i "s/extension=dummy.so/extension=dummy.so\nextension=kolabformat.so/" /usr/share/php5/kolab/kolab.ini
+	sed -i "s/extension=kolabformat.so/;extension=kolabformat.so/" /usr/share/php5/kolab/kolabformat.ini
+
+fi
+
 exit 0

debian.tar.gz/php-kolab.postrm Changed

@@ -6,9 +6,9 @@
 #DEBHELPER#
 
 if [ -d "/etc/php5/mods-available" ]; then
-    inidir=/etc/php5/mods-available/
+    inidir=/etc/php5/mods-available
 else
-    inidir=/etc/php5/conf.d/
+    inidir=/etc/php5/conf.d
 fi
 
 module=kolab
@@ -19,26 +19,52 @@
 
 # Query which package has this conffile registered
 if which ucfq >/dev/null; then
-    ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:)
+ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:)
 fi
 
 # Only work with the config file if it still belongs to us
 if test "$ucfp" = ${package}; then
-    if [ "$1" = "purge" ]; then
-        for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist;  do
-	        rm -f ${inidir}/${inifile}${ext}
-	    done
+  if [ "$1" = "purge" ]; then
+	  for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist;  do
+	  rm -f ${inidir}/${inifile}${ext}
+	  done
+	  rm -f ${inidir}/${inifile}
+	  if which ucf >/dev/null; then
+	  ucf --purge ${inidir}/${inifile}
+	  fi
+	  if which ucfr >/dev/null; then
+	  ucfr --purge ${package} ${inidir}/${inifile}
+	  fi
+  fi
+fi
 
-	    rm -f ${inidir}/${inifile}
+# Dummy plugin (workaround for #2050)
+module=kolabdummy
+package=php-kolab
+inifile=${module}.ini
 
-	    if which ucf >/dev/null; then
-	        ucf --purge ${inidir}/${inifile}
-	    fi
+dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.3.0~ -- "$@";
 
-	    if which ucfr >/dev/null; then
-	        ucfr --purge ${package} ${inidir}/${inifile}
-	    fi
-    fi
+# Query which package has this conffile registered
+if which ucfq >/dev/null; then
+ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:)
+fi
+
+# Only work with the config file if it still belongs to us
+if test "$ucfp" = ${package}; then
+  if [ "$1" = "purge" ]; then
+	  for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist;  do
+	  rm -f ${inidir}/${inifile}${ext}
+	  done
+	  rm -f ${inidir}/${inifile}
+	  if which ucf >/dev/null; then
+	  ucf --purge ${inidir}/${inifile}
+	  fi
+	  if which ucfr >/dev/null; then
+	  ucfr --purge ${package} ${inidir}/${inifile}
+	  fi
+  fi
 fi
+# End dummy plugin
 
 exit 0

Changes of Revision 2