Hello community, here is the log from the commit of package libkolab for openSUSE:Factory checked in at 2014-12-16 14:50:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-11-19 20:27:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkolab.new/libkolab.changes 2014-12-16 14:51:00.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 10 00:25:39 UTC 2014 - a...@ajaissle.de + +- Reenable building for non-Factory openSUSE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolab.spec ++++++ --- /var/tmp/diff_new_pack.NCdOnT/_old 2014-12-16 14:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.NCdOnT/_new 2014-12-16 14:51:05.000000000 +0100 @@ -15,6 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define with_kde 1 +%if 0%{?suse_version} < 1230 || 0%{?suse_version} == 1315 +%define with_kde 0 +%endif %define php_extdir %{_libdir}/php5/extensions %define php_confdir %{_sysconfdir}/php5/conf.d @@ -28,15 +32,19 @@ Url: https://kolab.org/about/libkolab Source: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz BuildRequires: boost-devel -BuildRequires: cmake >= 2.6.4 -BuildRequires: libXerces-c-devel +BuildRequires: cmake >= 2.6 +BuildRequires: libxerces-c-devel BuildRequires: libkolabxml-devel >= 1.0 BuildRequires: libqt4-devel BuildRequires: php-devel >= 5.3 BuildRequires: python-devel BuildRequires: swig >= 2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?with_kde} BuildRequires: libkdepimlibs4-devel >= 4.9 +%else +BuildRequires: libcalendaring-devel +%endif %if 0%{?suse_version} < 1140 BuildRequires: uuid-devel = 1.6.2 %endif @@ -82,7 +90,11 @@ Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} Requires: libXerces-c-devel +%if 0%{?with_kde} Requires: libkdepimlibs4-devel >= 4.9 +%else +Requires: libcalendaring-devel +%endif Requires: libkolabxml-devel >= 0.8.4 %description devel @@ -93,18 +105,46 @@ %prep %setup -q +# Lower cmake requirements for SLE 11 +%if 0%{?suse_version} < 1140 +sed -i '3s;cmake_minimum_required(VERSION 2.6.4);cmake_minimum_required(VERSION 2.6.2);' CMakeLists.txt +%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 + # TESTS: require X and most fail anyway %cmake \ -DLibkolabxml_DIR=%{_libdir}/cmake/Libkolabxml \ +%if 0%{?with_kde} -DUSE_LIBCALENDARING=FALSE \ +%else + -DUSE_LIBCALENDARING=TRUE \ +%endif -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir} \ -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ - -DBUILD_TESTS=FALSE + -DBUILD_TESTS=FALSE \ +%if 0%{?suse_version} < 1310 + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR=%{_lib} \ + .. +%endif + make %{?_smp_mflags} %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 mkdir -p %{buildroot}/%{_datadir}/php5 mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/php5/. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
