Hello community, here is the log from the commit of package libkolab for openSUSE:Factory checked in at 2013-07-10 17:27:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolab (Old) and /work/SRC/openSUSE:Factory/.libkolab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkolab" Changes: -------- --- /work/SRC/openSUSE:Factory/libkolab/libkolab.changes 2013-06-11 09:33:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkolab.new/libkolab.changes 2013-07-10 17:27:05.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jun 19 22:14:00 UTC 2013 - [email protected] + +- Build with libcalendaring if used with kolab + +------------------------------------------------------------------- +Sat Jun 8 21:37:57 UTC 2013 - [email protected] + +- Cleaning up spec file to reduce prjconf settings + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolab.spec ++++++ --- /var/tmp/diff_new_pack.9aUxeL/_old 2013-07-10 17:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.9aUxeL/_new 2013-07-10 17:27:05.000000000 +0200 @@ -20,6 +20,10 @@ %global php_extdir %{_libdir}/%{phpdir}/extensions %global php_inidir %{_sysconfdir}/%{phpdir}/conf.d +%if ! %{defined with_kolab} +%global with_kolab 0 +%endif + Name: libkolab Version: 0.4.2 Release: 0 @@ -27,7 +31,7 @@ Summary: Conversions from/to KDE containers License: LGPL-2.0+ and LGPL-3.0+ and AGPL-3.0+ Group: Development/Libraries/C and C++ -Url: http://wiki.kolab.org/Kolab_3.0_development#libkolab +Url: https://kolab.org/about/libkolab Source: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz # Patch to hack SWIGUtils.cmake to find PHP5 on openSUSE Patch0: fix_php5_bindings.diff @@ -35,10 +39,15 @@ Patch1: fix_FindSWIG.diff BuildRequires: boost-devel BuildRequires: cmake >= 2.6.4 -BuildRequires: libkdepimlibs4-devel >= 4.9 +%if ! 0%{?with_kolab} +BuildRequires: libkdepimlibs4-devel >= 4.10.0 +%else +# Note on libcalendaring: (essentially) a fork of various KDE 4.9 libraries, found in OBS server:Kolab +BuildRequires: libcalendaring-devel >= 4.9 +%endif +BuildRequires: libXerces-c-devel BuildRequires: libkolabxml-devel >= 0.8.4 BuildRequires: libqt4-devel -BuildRequires: libxerces-c-devel BuildRequires: php-devel >= 5.3 BuildRequires: python-devel %if 0%{?sles_version} == 11 @@ -85,9 +94,14 @@ Summary: Conversions from/to KDE containers Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} -Requires: libkdepimlibs4-devel +%if 0%{?suse_version} >= 1230 +Requires: libkdepimlibs4-devel >= 4.9 +%else +# Note on libcalendaring: (essentially) a fork of various KDE 4.9 libraries, found in OBS server:Kolab +Requires: libcalendaring-devel >= 4.9 +%endif +Requires: libXerces-c-devel Requires: libkolabxml-devel -Requires: libxerces-c-devel %description devel libkolab provides conversions from/to KDE containers, mime message handling and facilities @@ -110,9 +124,11 @@ -DLIB_INSTALL_DIR="%{_lib}" \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_BUILD_TYPE=RELEASE \ -%if 0%{?sles_version} == 11 || 0%{?fedora} == 17 - -DUSE_LIBCALENDARING=TRUE \ -DLibkolabxml_DIR=%{_libdir}/cmake/Libkolabxml \ +%if ! 0%{?with_kolab} + -DUSE_LIBCALENDARING=FALSE \ +%else + -DUSE_LIBCALENDARING=TRUE \ %endif -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir} \ -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ @@ -130,13 +146,14 @@ mkdir -p %{buildroot}/%{php_inidir} cat >%{buildroot}/%{php_inidir}/kolab.ini <<EOF ; Kolab libraries -extension=kolabshared.so -extension=kolabobject.so extension=kolabcalendaring.so extension=kolabicalendar.so +extension=kolabobject.so +extension=kolabshared.so EOF %post -n %{name}%{soname} -p /sbin/ldconfig + %postun -n %{name}%{soname} -p /sbin/ldconfig %files -n %{name}%{soname} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
