Hello community, here is the log from the commit of package libkolabxml for openSUSE:Factory checked in at 2017-09-13 22:17:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old) and /work/SRC/openSUSE:Factory/.libkolabxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkolabxml" Wed Sep 13 22:17:39 2017 rev:27 rq:517374 version:1.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2017-02-16 16:47:58.785018776 +0100 +++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes 2017-09-13 22:17:41.078465370 +0200 @@ -1,0 +2,10 @@ +Thu Aug 17 12:13:06 UTC 2017 - [email protected] + +- Drop patches to build against sle11: + * libkolabxml-0.8.3_fix_uuid_includes_SLE.patch + * libkolabxml-1.0.1_no-maybe-uninitialized.patch +- Remove few sle11/old openSUSE conditions to make it more readable +- Disable php on TW as php7 is not supported by the code and php5 + is removed + +------------------------------------------------------------------- Old: ---- libkolabxml-0.8.3_fix_uuid_includes_SLE.patch libkolabxml-1.0.1_no-maybe-uninitialized.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolabxml.spec ++++++ --- /var/tmp/diff_new_pack.Gzovpa/_old 2017-09-13 22:17:41.754370214 +0200 +++ /var/tmp/diff_new_pack.Gzovpa/_new 2017-09-13 22:17:41.758369651 +0200 @@ -16,16 +16,17 @@ # -%if 0%{?suse_version} < 1220 -%define _without_java 1 +%global php_extdir %{_libdir}/php5/extensions +%global php_confdir %{_sysconfdir}/php5/conf.d +%define libname %{name}1 +%if 0%{?suse_version} >= 1330 +%bcond_with php +%else +%bcond_without php %endif %bcond_without java %bcond_without mono %bcond_with tests - -%global php_extdir %{_libdir}/php5/extensions -%global php_confdir %{_sysconfdir}/php5/conf.d -%define libname %{name}1 Name: libkolabxml Version: 1.1.6 Release: 0 @@ -34,27 +35,22 @@ Group: Development/Libraries/C and C++ Url: https://kolab.org/about/libkolabxml Source: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz -# PATCH-FIX-SLE libkolabxml-0.8.3_fix_uuid_includes_SLE.patch -- Fix uuid.h path on SLE 11 -Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch -# PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and python bindings on SLE 11 -Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_system-devel -BuildRequires: libboost_thread-devel -%else -BuildRequires: boost-devel >= 1.4.1 -%endif BuildRequires: cmake >= 2.6 BuildRequires: gcc-c++ BuildRequires: libcurl-devel BuildRequires: libxerces-c-devel >= 3.0 -BuildRequires: php-devel >= 5.3 BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: swig >= 2.0 BuildRequires: xsd >= 3.0 -%if 0%{?suse_version} < 1140 -BuildRequires: uuid-devel = 1.6.2 +%if %{with php} +BuildRequires: php-devel >= 5.3 +%endif +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel +%else +BuildRequires: boost-devel >= 1.4.1 %endif %if %{with java} BuildRequires: gcc-java @@ -64,17 +60,11 @@ BuildRequires: mono-devel %endif %if %{with tests} -%if 0%{?suse_version} > 1314 BuildRequires: extra-cmake-modules BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Test) -%else -BuildRequires: libqt4-devel -%endif %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %description Libkolabxml serves as a serialization/de-serialization library for the the Kolab XML Format @@ -151,7 +141,7 @@ %package -n mono-%{libname} Summary: Mono (C#) bindings for %{name} -Group: Development/Languages/Mono +Group: Development/Languages/Other Requires: %{libname} = %{version} Provides: csharp-kolabformat = %{version} @@ -211,24 +201,8 @@ %prep %setup -q -%if 0%{?suse_version} < 1140 -%patch0 -%patch2 -p1 -%endif %build -# cmake: with earlier releases, we have to create and cd manually, as %%cmake is not available -%if 0%{?suse_version} < 1310 -%define cmake cmake -mkdir build -cd build -%endif - -# libexecdir: SLE11 expands to libdir, but we want /usr/lib/ -%if 0%{?suse_version} < 1140 -%define _libexecdir %{_prefix}/lib -%endif - # Tests require X server and net # no-undefined does not work as the php bindings are "magic" %cmake \ @@ -238,7 +212,9 @@ %if %{with java} -DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \ %endif +%if %{with php} -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir}\ +%endif -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ %if %{with mono} -DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_libexecdir}/mono/ \ @@ -249,27 +225,16 @@ -DBUILD_QT5=TRUE \ %endif %else - -DBUILD_TESTS=FALSE \ -%endif -%if 0%{?suse_version} < 1310 - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DLIB_INSTALL_DIR=%{_lib} \ - .. + -DBUILD_TESTS=FALSE %endif # parallel build is too unstable currently -#make %{?_smp_mflags} make -j1 %install -# cmake: with earlier releases, we have to change dir manually, as %%cmake_install is not available -%if 0%{?suse_version} < 1310 -cd build/ -make DESTDIR=%{buildroot} install -%else %cmake_install -%endif +%if %{with php} mkdir -p %{buildroot}/%{_datadir}/php5 mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/php5/kolabformat.php @@ -277,6 +242,7 @@ cat >%{buildroot}/%{php_confdir}/kolabformat.ini <<EOF extension=kolabformat.so EOF +%endif %if %{with tests} %check @@ -287,30 +253,27 @@ %endif %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%defattr(-,root,root) %doc AUTHORS COPYING README %{_libdir}/libkolabxml.so.* %files -n python-%{libname} -%defattr(-,root,root) %doc COPYING %{python_sitearch}/_kolabformat.so %{python_sitearch}/kolabformat.py* +%if %{with php} %files -n php-%{libname} -%defattr(-,root,root) %doc COPYING %config(noreplace) %{php_confdir}/kolabformat.ini %{_datadir}/php5/kolabformat.php %{php_extdir}/kolabformat.so +%endif %if %{with java} %files -n java-%{libname} -%defattr(-,root,root) %doc COPYING %dir %{_libdir}/java/ %{_libdir}/java/* @@ -318,13 +281,11 @@ %if %{with mono} %files -n mono-%{libname} -%defattr(-,root,root) %doc COPYING %{_libexecdir}/mono/* %endif %files devel -%defattr(-,root,root) %doc DEVELOPMENT %dir %{_libdir}/cmake/ %{_libdir}/cmake/Libkolabxml/
