Hello community, here is the log from the commit of package libkolab-qt5 for openSUSE:Factory checked in at 2017-09-13 22:17:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old) and /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkolab-qt5" Wed Sep 13 22:17:48 2017 rev:9 rq:517376 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes 2017-02-16 16:42:48.337104285 +0100 +++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes 2017-09-13 22:17:52.104913029 +0200 @@ -1,0 +2,6 @@ +Thu Aug 17 12:32:22 UTC 2017 - [email protected] + +- Run spec-cleaner +- Build with php7 on TW, but not supported so disabled for now + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolab-qt5.spec ++++++ --- /var/tmp/diff_new_pack.tW9hYn/_old 2017-09-13 22:17:52.704828571 +0200 +++ /var/tmp/diff_new_pack.tW9hYn/_new 2017-09-13 22:17:52.704828571 +0200 @@ -16,9 +16,17 @@ # -%define php_extdir %{_libdir}/php5/extensions -%define php_confdir %{_sysconfdir}/php5/conf.d +%define php_extdir %{_libdir}/%{php_ver}/extensions +%define php_confdir %{_sysconfdir}/%{php_ver}/conf.d %define libname libkolab1 +%if 0%{?suse_version} >= 1330 +%global php_ver php7 +# php7 not supported +%bcond_with php +%else +%global php_ver php5 +%bcond_without php +%endif Name: libkolab-qt5 Version: 1.0.2 Release: 0 @@ -29,16 +37,6 @@ Source: libkolab-%{version}.tar.gz BuildRequires: akonadi-notes-devel BuildRequires: akonadi-server-devel -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_atomic-devel -BuildRequires: libboost_chrono-devel -BuildRequires: libboost_date_time-devel -BuildRequires: libboost_program_options-devel -BuildRequires: libboost_system-devel -BuildRequires: libboost_thread-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: cmake >= 2.8.9 BuildRequires: kcalcore-devel BuildRequires: kcalutils-devel @@ -47,7 +45,6 @@ BuildRequires: kmime-devel BuildRequires: libkolabxml-devel >= 1.1.1 BuildRequires: libxerces-c-devel -BuildRequires: php-devel >= 5.3 BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: swig >= 2.0 @@ -56,7 +53,19 @@ BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_atomic-devel +BuildRequires: libboost_chrono-devel +BuildRequires: libboost_date_time-devel +BuildRequires: libboost_program_options-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel +%else +BuildRequires: boost-devel +%endif +%if %{with php} +BuildRequires: %{php_ver}-devel >= 5.3 +%endif %description libkolab provides conversions from/to KDE containers, MIME message handling and facilities @@ -72,15 +81,18 @@ to read and write kolabv2 and kolabv3. The Akonadi-Kolab-Resource as well as the upgradetool are based on this code. -%package -n php-%{libname} +%package -n %{php_ver}-%{libname} Summary: PHP Bindings for libkolab Group: Development/Languages/Other Requires: %{libname} = %{version} +%if "%{php_ver}" == "php5" Conflicts: otherproviders(php-kolab) +Provides: php-%{libname} Provides: php-kolab = %{version} Obsoletes: php-kolab < %{version} +%endif -%description -n php-%{libname} +%description -n %{php_ver}-%{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. @@ -129,7 +141,9 @@ %else -DUSE_LIBCALENDARING=TRUE \ %endif +%if %{with php} -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir} \ +%endif -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ -DBUILD_TESTS=FALSE @@ -141,8 +155,9 @@ # cmake: with earlier releases, we have to change dir manually, as %%cmake_install is not available %cmake_install -mkdir -p %{buildroot}%{_datadir}/php5 -mv %{buildroot}%{php_extdir}/*.php %{buildroot}%{_datadir}/php5/. +%if %{with php} +mkdir -p %{buildroot}%{_datadir}/%{php_ver} +mv %{buildroot}%{php_extdir}/*.php %{buildroot}%{_datadir}/%{php_ver}/. mkdir -p %{buildroot}%{php_confdir} cat >%{buildroot}%{php_confdir}/kolab.ini <<EOF @@ -157,32 +172,32 @@ ; Kolab libraries extension=dummy.so EOF +%endif %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%defattr(-,root,root) %doc COPYING* README RELEASE-NOTES %{_libdir}/libkolab.so.* -%files -n php-%{libname} -%defattr(-,root,root) +%if %{with php} +%files -n %{php_ver}-%{libname} %config(noreplace) %{php_confdir}/kolab.ini %config(noreplace) %{php_confdir}/kolabdummy.ini -%{_datadir}/php5/kolabcalendaring.php +%{_datadir}/%{php_ver}/kolabcalendaring.php %{php_extdir}/kolabcalendaring.so -%{_datadir}/php5/kolabicalendar.php +%{_datadir}/%{php_ver}/kolabicalendar.php %{php_extdir}/kolabicalendar.so -%{_datadir}/php5/kolabobject.php +%{_datadir}/%{php_ver}/kolabobject.php %{php_extdir}/kolabobject.so -%{_datadir}/php5/kolabshared.php +%{_datadir}/%{php_ver}/kolabshared.php %{php_extdir}/kolabshared.so -%{_datadir}/php5/dummy.php +%{_datadir}/%{php_ver}/dummy.php %{php_extdir}/dummy.so +%endif %files -n python-%{libname} -%defattr(-,root,root) %dir %{python_sitearch}/kolab %{python_sitearch}/kolab/_calendaring.so %{python_sitearch}/kolab/calendaring.py* @@ -194,7 +209,6 @@ %{python_sitearch}/kolab/shared.py* %files devel -%defattr(-,root,root) %{_includedir}/kolab/ %{_libdir}/libkolab.so %{_libdir}/cmake/Libkolab/
