Rebuild for xerces-c 3.3

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -1,2 +1,4 @@
 /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

@@ -0,0 +1,12 @@
+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,4 +1,6 @@
 
+%undefine __cmake_in_source_build
+
 %{?!mono_arches: %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64}
 
 %ifarch %{mono_arches}
@@ -6,31 +8,27 @@
 %global with_csharp 0
 %endif
 %global with_java 1
-%if 0%{?fedora} > 24
-# FTBFS on rawhide -- rex
-%global with_php 0 
+%if 0%{?fedora} >= 41
+%ifarch %{ix86}
+%global with_php 0
+%else
+%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
 %if 0%{?with_php} > 0
 %if 0%{?with_python} > 0
 %{?filter_setup:
-%filter_provides_in %{python2_sitearch}/.*\.so$
+%filter_provides_in %{python3_sitearch}/.*\.so$
 %filter_provides_in %{php_extdir}/.*\.so$
 %filter_setup
 }
@@ -43,34 +41,42 @@
 %else
 %if 0%{?with_python} > 0
 %{?filter_setup:
-%filter_provides_in %{python2_sitearch}/.*\.so$
+%filter_provides_in %{python3_sitearch}/.*\.so$
 %filter_setup
 }
 %endif
 %endif
 
 Name:           libkolabxml
-Version:        1.1.4
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        29%{?dist}
 Summary:        Kolab XML format collection parser library
 
-License:        LGPLv3+
+License:        LGPL-3.0-or-later
 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
 BuildRequires:  xsd
 
+# libkolab FTBFS, so ...
+# https://bugzilla.redhat.com/show_bug.cgi?id=1518800
+%global libkolab_obsoletes 1.0.2-20
+%if 0%{?libkolab_obsoletes:1}
+Obsoletes: libkolab < %{libkolab_obsoletes}
+Obsoletes: libkolab-devel < %{libkolab_obsoletes}
+Obsoletes: python2-libkolab < %{libkolab_obsoletes}
+%endif
+
 %if 0%{?with_csharp} < 1
 Obsoletes:      csharp-kolabformat < %{version}-%{release}
 #Provides:       csharp-kolabformat = %{version}-%{release}
@@ -89,7 +95,6 @@ Obsoletes:      php-kolabformat < %{version}-%{release}
 %if 0%{?with_python} < 1
 Obsoletes:      python-kolabformat < %{version}-%{release}
 Obsoletes:      python2-kolabformat < %{version}-%{release}
-#Provides:       python-kolabformat = %{version}-%{release}
 %endif
 
 %description
@@ -128,12 +133,8 @@ 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
@@ -142,26 +143,27 @@ bindings provided through libkolabxml.
 %endif
 
 %if 0%{?with_python} > 0
-%package -n python2-kolabformat
+%package -n python3-kolabformat
 Summary:        Python bindings for libkolabxml
 Obsoletes:      python-kolabformat < 1.1.4
 Provides:       python-kolabformat = %{version}-%{release}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-BuildRequires:  python2-devel
-%description -n python2-kolabformat
+BuildRequires:  python3-devel
+%description -n python3-kolabformat
 The PyKolab format package offers a comprehensive Python library using the
 bindings provided through libkolabxml.
 %endif
 
 
 %prep
-%setup -q -n libkolabxml-%{version}
+%autosetup -p1
+
+sed -i "s/-php/-php7/g" src/php/CMakeLists.txt
 
 
 %build
-mkdir build
-pushd build
-%cmake .. \
+%cmake \
+    -DBUILD_TESTS:BOOL=OFF \
 %if 0%{?with_csharp} > 0
     -DCSHARP_BINDINGS=ON \
     -DCSHARP_INSTALL_DIR=%{_datadir}/%{name}/csharp/ \
@@ -176,22 +178,19 @@ pushd build
 %endif
 %if 0%{?with_python} > 0
     -DPYTHON_BINDINGS=ON \
-    -DPYTHON_INSTALL_DIR=%{python2_sitearch}
+    -DPYTHON_INSTALL_DIR=%{python3_sitearch}
 %endif
 
-popd
-
-make -C build
+%cmake_build
 
 
 %install
-make install DESTDIR=%{buildroot} INSTALL='install -p' -C build
+%cmake_install
 
 %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
@@ -199,25 +198,18 @@ EOF
 
 
 %check
-pushd build
-# Make sure libkolabxml.so.* is found, otherwise the tests fail
+pushd %{_vpath_builddir}
 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
 %if 0%{?with_python} > 0
-python src/python/test.py ||:
+python3 src/python/test.py ||:
 %endif
 popd
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %doc DEVELOPMENT NEWS README
@@ -243,19 +235,189 @@ 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
 
 %if 0%{?with_python} > 0
-%files -n python2-kolabformat
-%{python_sitearch}/kolabformat.py*
-%{python_sitearch}/_kolabformat.so
+%files -n python3-kolabformat
+%{python3_sitearch}/kolabformat.py
+%{python3_sitearch}/_kolabformat.so
+%{python3_sitearch}/__pycache__/*
 %endif
 
 
 %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
+
+* Thu Jan 31 2019 Kalev Lember <klember@redhat.com> - 1.1.6-10
+- Rebuilt for Boost 1.69
+
+* Mon Jan 21 2019 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 1.1.6-9
+- enable PHP again, supporting PHP 7
+
+* Mon Jan 21 2019 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 1.1.6-8
+- enable Python again, supporting Python 3
+
+* Mon Jan 21 2019 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 1.1.6-7
+- Drop python2-kolabformat for mass Python 2 package removal
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.1.6-6
+- Rebuild with fixed binutils
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Apr 04 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.1.6-4
+- Obsoletes: libkolab < 1.0.2-20
+- use %%ldconfig_scriptlets
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 31 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.1.6-2
+- rebuild (boost)
+
+* Wed Nov 29 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.1.6-1
+- 1.1.6
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 20 2017 Kalev Lember <klember@redhat.com> - 1.1.4-6
+- Rebuilt for Boost 1.64
+
+* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.1.4-5
+- Rebuild due to bug in RPM (RHBZ #1468476)
+
+* Tue Feb 07 2017 Kalev Lember <klember@redhat.com> - 1.1.4-4
+- Rebuilt for Boost 1.63
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Tue Jun 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.1.4-2
 - -devel: Requires: libcurl-devel xerces-c-devel
 

sources

@@ -1 +1 @@
-71b1ee00ca9288e33ebcddf614b50f89  libkolabxml-1.1.4.tar.gz
+SHA512 (libkolabxml-1.2.0.tar.gz) = f3defe1cec6b925a10bd713c5c4b48805696a4d849f080bbfa855fa9815fef30ecbcae1e494ad449fc58f350681857c8d6645ce844458eb378c51e1382491bb5