Hello community,
here is the log from the commit of package libkolab for openSUSE:Factory checked in at 2014-11-19 20:24:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-02 08:22:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libkolab.new/libkolab.changes 2014-11-19 20:27:06.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Nov 10 12:34:54 UTC 2014 - tchvatal@suse.com
+
+- Do not require binding packages in devel
+
+-------------------------------------------------------------------
+Fri Nov 7 09:59:22 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner
+- Remove some of the confusing stuff and conditions
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkolab.spec ++++++
--- /var/tmp/diff_new_pack.ddZEBt/_old 2014-11-19 20:27:07.000000000 +0100
+++ /var/tmp/diff_new_pack.ddZEBt/_new 2014-11-19 20:27:07.000000000 +0100
@@ -16,18 +16,12 @@
#
-%global phpdir php5
-%global php_extdir %{_libdir}/%{phpdir}/extensions
-%global php_inidir %{_sysconfdir}/%{phpdir}/conf.d
-
-%if ! %{defined with_kolab}
-%global with_kolab 0
-%endif
-
+%define php_extdir %{_libdir}/php5/extensions
+%define php_confdir %{_sysconfdir}/php5/conf.d
+%define libname %{name}0
Name: libkolab
Version: 0.5.3
Release: 0
-%define soname 0
Summary: Conversions from/to KDE containers
License: LGPL-2.0+ and LGPL-3.0+ and AGPL-3.0+
Group: Development/Libraries/C and C++
@@ -35,55 +29,50 @@
Source: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6.4
-%if ! 0%{?with_kolab}
-BuildRequires: libkdepimlibs4-devel >= 4.9
-%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 >= 1.0
BuildRequires: libqt4-devel
BuildRequires: php-devel >= 5.3
BuildRequires: python-devel
-%if 0%{?sles_version} == 11
-BuildRequires: uuid-devel = 1.6.2
-%endif
BuildRequires: swig >= 2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libkdepimlibs4-devel >= 4.9
+%if 0%{?suse_version} < 1140
+BuildRequires: uuid-devel = 1.6.2
+%endif
%description
libkolab provides conversions from/to KDE containers, mime message handling and facilities
to read and write kolabv2 and kolabv3.
The Akonadi-Kolab-Resource as well as the upgradetool are based on this code.
-%package -n %{name}%{soname}
+%package -n %{libname}
Summary: Conversions from/to KDE containers
Group: Development/Libraries/C and C++
-%description -n %{name}%{soname}
+%description -n %{libname}
libkolab provides conversions from/to KDE containers, mime message handling and facilities
to read and write kolabv2 and kolabv3.
The Akonadi-Kolab-Resource as well as the upgradetool are based on this code.
-%package -n php-%{name}%{soname}
+%package -n php-%{libname}
Summary: PHP Bindings for libkolab
Group: Development/Languages/Other
-Requires: %{name}%{soname} = %{version}
+Requires: %{libname} = %{version}
Provides: php-kolab = %{version}
-%description -n php-%{name}%{soname}
+%description -n php-%{libname}
libkolab provides conversions from/to KDE containers, mime message handling and facilities
to read and write kolabv2 and kolabv3.
This package provides PHP Bindings for libkolab.
-%package -n python-%{name}%{soname}
+%package -n python-%{libname}
Summary: Python bindings for libkolab
Group: Development/Languages/Python
-Requires: %{name}%{soname} = %{version}
+Requires: %{libname} = %{version}
Provides: python-kolab = %{version}
-%description -n python-%{name}%{soname}
+%description -n python-%{libname}
libkolab provides conversions from/to KDE containers, mime message handling and facilities
to read and write kolabv2 and kolabv3.
This package provides Python bindings for libkolab.
@@ -91,14 +80,9 @@
%package devel
Summary: Conversions from/to KDE containers
Group: Development/Libraries/C and C++
-Requires: %{name}%{soname} = %{version}
-%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: %{libname} = %{version}
Requires: libXerces-c-devel
+Requires: libkdepimlibs4-devel >= 4.9
Requires: libkolabxml-devel >= 0.8.4
%description devel
@@ -110,39 +94,23 @@
%setup -q
%build
- export CXXFLAGS="%{optflags}"
- export CFLAGS="$CXXFLAGS"
-
- mkdir build
- cd build
-
- cmake -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
- -DLIB_INSTALL_DIR="%{_lib}" \
- -DINCLUDE_INSTALL_DIR="%{_includedir}" \
- -DCMAKE_SKIP_RPATH=TRUE \
- -DCMAKE_BUILD_TYPE=RELEASE \
+# TESTS: require X and most fail anyway
+%cmake \
-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} \
- -DBUILD_TESTS=FALSE \
- ..
-
- %{__make} %{?_smp_mflags}
+ -DBUILD_TESTS=FALSE
+make %{?_smp_mflags}
%install
- cd build
- %{__make} DESTDIR=%{buildroot} install
+%cmake_install
- mkdir -p %{buildroot}/%{_datadir}/%{phpdir}
- mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/%{phpdir}/.
+mkdir -p %{buildroot}/%{_datadir}/php5
+mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/php5/.
- mkdir -p %{buildroot}/%{php_inidir}
- cat >%{buildroot}/%{php_inidir}/kolab.ini <