.gitignore

@@ -1,4 +1,3 @@
 /libkolabxml-1.0.3.tar.gz
 /libkolabxml-1.1.4.tar.gz
 /libkolabxml-1.1.6.tar.gz
-/libkolabxml-1.2.0.tar.gz

libkolabxml-1.2.0-fix-for-swig4.patch

@@ -1,12 +0,0 @@
-diff -up libkolabxml-1.2.0/src/php/CMakeLists.txt.swig libkolabxml-1.2.0/src/php/CMakeLists.txt
---- libkolabxml-1.2.0/src/php/CMakeLists.txt.swig	2022-09-19 21:22:05.943413603 +0200
-+++ libkolabxml-1.2.0/src/php/CMakeLists.txt	2022-09-19 21:22:54.036485986 +0200
-@@ -66,7 +66,7 @@ if(NOT PHP_VERSION_ID VERSION_LESS ${PHP
- 
-   install( FILES
-           ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php
--          DESTINATION ${PHP_INSTALL_DIR}
-+          DESTINATION ${PHP_INSTALL_DIR} OPTIONAL
-       )
- 
- else()

libkolabxml.spec

@@ -1,6 +1,4 @@
 
-%undefine __cmake_in_source_build
-
 %{?!mono_arches: %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64}
 
 %ifarch %{mono_arches}
@@ -8,20 +6,24 @@
 %global with_csharp 0
 %endif
 %global with_java 1
-%if 0%{?fedora} >= 41
-%ifarch %{ix86}
-%global with_php 0
-%else
+%if 0%{?fedora} > 24
+# FTBFS on rawhide -- rex
 %global with_php 1
-%endif
 %else
 %global with_php 1
 %endif
 %global with_python 1
 
 %if 0%{?with_php} > 0
+%{!?php_extdir: %global php_extdir %{_libdir}/php/modules}
+%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d/}
+%{!?php_apiver: %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}
+%if "%{php_version}" < "5.6"
+%global ini_name     kolabformat.ini
+%else
 %global ini_name     40-kolabformat.ini
 %endif
+%endif
 
 # Filter out private python and php libs. Does not work on EPEL5,
 # therefor we use it conditionally
@@ -48,21 +50,23 @@
 %endif
 
 Name:           libkolabxml
-Version:        1.2.0
-Release:        29%{?dist}
+Version:        1.1.6
+Release:        11%{?dist}
 Summary:        Kolab XML format collection parser library
 
-License:        LGPL-3.0-or-later
+License:        LGPLv3+
 URL:            http://www.kolab.org
 
+#Source0:       http://mirror.kolabsys.com/pub/releases/libkolabxml-%{version}.tar.gz
 Source0:        https://cgit.kolab.org/libkolabxml/snapshot/libkolabxml-%{version}.tar.gz
-Patch0:         libkolabxml-1.2.0-fix-for-swig4.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.6
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libcurl-devel
+# only used in tests?
+BuildRequires:  qt4-devel
 BuildRequires:  swig
 BuildRequires:  uuid-devel
 BuildRequires:  xerces-c-devel
@@ -133,8 +137,12 @@ Java bindings for libkolabxml
 %package -n php-kolabformat
 Summary:        PHP bindings for libkolabxml
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?rhel} > 5 || 0%{?fedora} > 15
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
+%else
+Requires:       php-api = %{php_apiver}
+%endif
 BuildRequires:  php >= 5.3
 BuildRequires:  php-devel >= 5.3
 %description -n php-kolabformat
@@ -156,14 +164,14 @@ bindings provided through libkolabxml.
 
 
 %prep
-%autosetup -p1
-
+%setup -q -n libkolabxml-%{version}
 sed -i "s/-php/-php7/g" src/php/CMakeLists.txt
 
 
 %build
-%cmake \
-    -DBUILD_TESTS:BOOL=OFF \
+mkdir build
+pushd build
+%cmake .. \
 %if 0%{?with_csharp} > 0
     -DCSHARP_BINDINGS=ON \
     -DCSHARP_INSTALL_DIR=%{_datadir}/%{name}/csharp/ \
@@ -181,16 +189,18 @@ sed -i "s/-php/-php7/g" src/php/CMakeLists.txt
     -DPYTHON_INSTALL_DIR=%{python3_sitearch}
 %endif
 
-%cmake_build
+popd
 
+make -C build
 
 %install
-%cmake_install
+make install DESTDIR=%{buildroot} INSTALL='install -p' -C build
 
 %if 0%{?with_php} > 0
 mkdir -p \
     %{buildroot}/%{_datadir}/php \
     %{buildroot}/%{php_inidir}/
+mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/php/kolabformat.php
 cat > %{buildroot}/%{php_inidir}/%{ini_name} << EOF
 extension=kolabformat.so
 EOF
@@ -198,8 +208,14 @@ EOF
 
 
 %check
-pushd %{_vpath_builddir}
+pushd build
+# Make sure libkolabxml.so.* is found, otherwise the tests fail
 export LD_LIBRARY_PATH=$( pwd )/src/
+pushd tests
+./bindingstest ||:
+./conversiontest ||:
+./parsingtest ||:
+popd
 %if 0%{?with_php} > 0
 php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
 %endif
@@ -235,6 +251,7 @@ popd
 
 %if 0%{?with_php} > 0
 %files -n php-kolabformat
+%{_datadir}/php/kolabformat.php
 %{php_extdir}/kolabformat.so
 %config(noreplace) %{php_inidir}/%{ini_name}
 %endif
@@ -248,124 +265,6 @@ popd
 
 
 %changelog
-* Mon Oct 21 2024 Pete Walter <pwalter@fedoraproject.org> - 1.2.0-29
-- Rebuild for xerces-c 3.3
-
-* Fri Oct 18 2024 Pete Walter <pwalter@fedoraproject.org> - 1.2.0-28
-- Rebuild for xerces-c 3.3
-
-* Mon Oct 14 2024 Remi Collet <remi@fedoraproject.org> - 1.2.0-27
-- rebuild for https://fedoraproject.org/wiki/Changes/php84
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jul 17 2024 Miroslav Suchý <msuchy@redhat.com> - 1.2.0-25
-- convert license to SPDX
-
-* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1.2.0-24
-- Rebuilt for Python 3.13
-
-* Tue Apr  9 2024 Remi Collet <remi@fedoraproject.org> - 8.0.1-14
-- disable PHP extension on 32-bit
-  https://fedoraproject.org/wiki/Changes/php_no_32_bit
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 1.2.0-20
-- Rebuilt for Boost 1.83
-
-* Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 1.2.0-19
-- rebuild for https://fedoraproject.org/wiki/Changes/php83
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.2.0-17
-- Rebuilt for Python 3.12
-
-* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 1.2.0-16
-- Rebuilt for Boost 1.81
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Nov 03 2022 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 1.2.0-14
-- add a patch for Swig 4.1 (bug 2137815)
-
-* Wed Oct 05 2022 Remi Collet <remi@remirepo.net> - 1.2.0-13
-- rebuild for https://fedoraproject.org/wiki/Changes/php82
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.2.0-11
-- Rebuilt for Python 3.11
-
-* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 1.2.0-10
-- Rebuilt for Boost 1.78
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Oct 28 2021 Remi Collet <remi@remirepo.net> - 1.2.0-8
-- rebuild for https://fedoraproject.org/wiki/Changes/php81
-
-* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 1.2.0-7
-- Rebuilt for Boost 1.76
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 14 2021 Rex Dieter <rdieter@fedoraproject.org> - 1.2.0-5
-- drop depredated qt4 dep
-- -DBUILD_TESTS=OFF (tests require qt4)
-- use %%autosetup
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.2.0-4
-- Rebuilt for Python 3.10
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 1.2.0-2
-- Rebuilt for Boost 1.75
-
-* Mon Sep 28 2020 Jeff Law <law@redhat.com> - 1.2.0-1
-- Re-enable LTO
-
-* Sat Aug 15 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 1.2.0-0
-- Upgrade to libkolabxml 1.2.0
-
-* Mon Aug 10 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 1.1.6-19
-- Adjusted for new cmake macros (out of source builds)
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-18
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat May 30 2020 Jonathan Wakely <jwakely@redhat.com> - 1.1.6-16
-- Rebuilt for Boost 1.73
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.6-15
-- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.6-13
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.6-12
-- Rebuilt for Python 3.8
-
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (libkolabxml-1.2.0.tar.gz) = f3defe1cec6b925a10bd713c5c4b48805696a4d849f080bbfa855fa9815fef30ecbcae1e494ad449fc58f350681857c8d6645ce844458eb378c51e1382491bb5
+SHA512 (libkolabxml-1.1.6.tar.gz) = 38543610b3cba48c211132b21ba2f64cd8b84250abd6d42881e0c7d64d9d9014b084cc586ca3f84c0a1573ffc0da64f3d0dad782ccd8ff908cc09937bd2bda2e