Request 2528 (superseded)

libkolabxml.spec Changed

@@ -4,9 +4,6 @@
 #!BuildIgnore:	httpd
 %endif
 
-# The cmake macro changed to build out of source by default, which breaks our own out of source build, so disable that.
-%define __cmake_in_source_build 1
-
 %{?!mono_arches: %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64}
 
 %ifarch %{mono_arches}
@@ -15,18 +12,11 @@
 %endif
 %global with_java 1
 %global with_php 1
-%if 0%{?rhel} >= 9
-%global with_python 0
-%else
 %global with_python 1
-%endif
-%global with_python3 1
-
-
-%if 0%{?with_php} > 0
 
 %{expand: %(if `php-config --vernum` -gt 70000 ; then echo %%global with_php7 1; else echo %%global with_php7 0; fi)}
 
+%if 0%{?with_php} > 0
 %if 0%{?suse_version}
 %global php php5
 %{!?php_extdir: %global php_extdir %{_libdir}/php5/extensions}
@@ -44,15 +34,12 @@
 %{!?python2_sitearch: %global python2_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
 
-%if 0%{?with_python3} > 0
-%{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python3_sitearch: %global python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%endif
-
-%if 0%{?with_python3} > 0
+# 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
 }
@@ -62,13 +49,21 @@
 %filter_setup
 }
 %endif
+%else
+%if 0%{?with_python} > 0
+%{?filter_setup:
+%filter_provides_in %{python2_sitearch}/.*\.so$
+%filter_setup
+}
+%endif
+%endif
 
 %if 0%{?suse_version}
 Name: libkolabxml1
 %else
 Name: libkolabxml
 %endif
-Version: 1.3.1
+Version: 1.2.0
 Release: 1%{?dist}
 Summary: Kolab XML format collection parser library
 
@@ -91,7 +86,6 @@
 BuildRequires: gcc-c++
 BuildRequires: libcurl-devel
 BuildRequires: make
-
 %if 0%{?suse_version}
 BuildRequires: qt-devel
 %else
@@ -101,7 +95,7 @@
 BuildRequires: qt4-devel
 %endif
 %endif
-BuildRequires: swig >= 4.1
+BuildRequires: swig
 BuildRequires: uuid-devel
 BuildRequires: xsd
 
@@ -111,13 +105,6 @@
 BuildRequires: xerces-c-devel
 %endif
 
-# For running zonetabconversion.py
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-BuildRequires: python3
-%else
-BuildRequires: python
-%endif
-
 Provides: libkolabxml%{?_isa} = %{version}
 
 %if 0%{?with_csharp} < 1
@@ -140,11 +127,6 @@
 Provides: python-kolabformat = %{version}-%{release}
 %endif
 
-%if 0%{?with_python3} < 1
-Obsoletes: python3-kolabformat < %{version}-%{release}
-Provides: python3-kolabformat = %{version}-%{release}
-%endif
-
 %description
 The libkolabxml parsing library interprets Kolab XML formats (xCal, xCard)
 with bindings for Python, PHP and other languages. The language bindings
@@ -168,15 +150,11 @@
 Requires: libcurl-devel
 %if 0%{?with_php} > 0
 Requires: php-devel >= 5.3
-%if 0%{?plesk}
-%if 0%{?rhel} < 9
+%if 0%{plesk}
+Requires: plesk-php56-devel
+Requires: plesk-php70-devel
+Requires: plesk-php71-devel
 Requires: plesk-php72-devel
-Requires: plesk-php73-devel
-%endif
-Requires: plesk-php74-devel
-Requires: plesk-php80-devel
-Requires: plesk-php81-devel
-Requires: plesk-php82-devel
 %endif
 %endif
 %if 0%{?with_python} > 0
@@ -186,9 +164,6 @@
 Requires: python-devel
 %endif
 %endif
-%if 0%{?with_python3} > 0
-Requires: python3-devel
-%endif
 %if 0%{?suse_version}
 Requires: qt-devel
 %else
@@ -198,6 +173,7 @@
 Requires: qt4-devel
 %endif
 %endif
+Requires: swig
 Requires: uuid-devel
 %if 0%{?suse_version}
 Requires: libxerces-c-devel
@@ -246,7 +222,6 @@
 %package -n php-kolabformat
 Summary: PHP bindings for libkolabxml
 Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
 Requires: libkolabxml%{?_isa} = %{version}
 %if 0%{?rhel} > 5 || 0%{?fedora} > 15
 Requires: php(zend-abi) = %{php_zend_api}
@@ -263,14 +238,10 @@
 BuildRequires: php >= 5.3
 BuildRequires: php-devel >= 5.3
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
+BuildRequires: plesk-php56-devel
+BuildRequires: plesk-php70-devel
+BuildRequires: plesk-php71-devel
 BuildRequires: plesk-php72-devel
-BuildRequires: plesk-php73-devel
-%endif
-BuildRequires: plesk-php74-devel
-BuildRequires: plesk-php80-devel
-BuildRequires: plesk-php81-devel
-BuildRequires: plesk-php82-devel
 %endif
 
 %description -n php-kolabformat
@@ -279,68 +250,41 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-%package -n plesk-php72-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 7.2
+%package -n plesk-php56-kolabformat
+Summary: libkolabxml bindings for Plesk's PHP 5.6
 Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
 Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php72
+Requires: plesk-php56
 
-%description -n plesk-php72-kolabformat
-libkolabxml bindings for Plesk's PHP 7.2
+%description -n plesk-php56-kolabformat
+libkolabxml bindings for Plesk's PHP 5.6
 
-%package -n plesk-php73-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 7.3
+%package -n plesk-php70-kolabformat
+Summary: libkolabxml bindings for Plesk's PHP 7.0
 Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
 Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php73
+Requires: plesk-php70
 
-%description -n plesk-php73-kolabformat
-libkolabxml bindings for Plesk's PHP 7.3
+%description -n plesk-php70-kolabformat
+libkolabxml bindings for Plesk's PHP 7.0
 
-%endif
-%package -n plesk-php74-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 7.4
+%package -n plesk-php71-kolabformat
+Summary: libkolabxml bindings for Plesk's PHP 7.1
 Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
 Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php74
-
-%description -n plesk-php74-kolabformat
-libkolabxml bindings for Plesk's PHP 7.4
+Requires: plesk-php71
 
-%package -n plesk-php80-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 8.0
-Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
-Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php80
-
-%description -n plesk-php80-kolabformat
-libkolabxml bindings for Plesk's PHP 8.0
-
-%package -n plesk-php81-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 8.1
-Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
-Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php81
+%description -n plesk-php71-kolabformat
+libkolabxml bindings for Plesk's PHP 7.1
 
-%description -n plesk-php81-kolabformat
-libkolabxml bindings for Plesk's PHP 8.1
-
-%package -n plesk-php82-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 8.2
+%package -n plesk-php72-kolabformat
+Summary: libkolabxml bindings for Plesk's PHP 7.2
 Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
 Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php82
-
-%description -n plesk-php82-kolabformat
-libkolabxml bindings for Plesk's PHP 8.2
+Requires: plesk-php72
 
+%description -n plesk-php72-kolabformat
+libkolabxml bindings for Plesk's PHP 7.2
 %endif # if 0%{?plesk}
 
 %if 0%{?with_python} > 0
@@ -363,22 +307,6 @@
 bindings provided through libkolabxml.
 %endif
 
-%if 0%{?with_python3} > 0
-%package -n python3-kolabformat
-Summary: Python3 bindings for libkolabxml
-Group: System Environment/Libraries
-Requires: libkolabxml%{?_isa} = %{version}
-%if 0%{?suse_version}
-Obsoletes: python3-%{name} < %{version}
-Provides: python3-%{name} = %{version}
-%endif
-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 -c -n libkolabxml-%{version}
 pwd
@@ -389,58 +317,32 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.2
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.2/src/php/CMakeLists.txt
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.3
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.3/src/php/CMakeLists.txt
-
-%endif
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.4
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.4/src/php/CMakeLists.txt
+cp -a libkolabxml-%{version} libkolabxml-%{version}-5.6
 
-cp -a libkolabxml-%{version} libkolabxml-%{version}-8.0
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.0/src/php/CMakeLists.txt
+cp -a libkolabxml-%{version} libkolabxml-%{version}-7.0
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.0/src/php/CMakeLists.txt
 
-cp -a libkolabxml-%{version} libkolabxml-%{version}-8.1
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
+cp -a libkolabxml-%{version} libkolabxml-%{version}-7.1
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.1/src/php/CMakeLists.txt
 
-cp -a libkolabxml-%{version} libkolabxml-%{version}-8.2
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.2/src/php/CMakeLists.txt
+cp -a libkolabxml-%{version} libkolabxml-%{version}-7.2
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.2/src/php/CMakeLists.txt
 %endif
 
 %if 0%{?with_php7}
-pushd %{name}-%{version}
 sed -i "s/-php/-php7/g" src/php/CMakeLists.txt
-popd
-%endif
-
-%if 0%{?with_python3} > 0
-cp -a libkolabxml-%{version} libkolabxml-%{version}-python3
 %endif
 
 %build
 pushd %{name}-%{version}
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-%{python3} utils/zonetabconversion.py
-%else
-%{__python2} utils/zonetabconversion.py
-%endif
+python utils/zonetabconversion.py
 popd
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
+cp %{name}-%{version}/tztable.h %{name}-%{version}-5.6/.
+cp %{name}-%{version}/tztable.h %{name}-%{version}-7.0/.
+cp %{name}-%{version}/tztable.h %{name}-%{version}-7.1/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.2/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.3/.
-%endif
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.4/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-8.0/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-8.1/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-8.2/.
-%endif
-%if 0%{?with_python3} > 0
-cp %{name}-%{version}/tztable.h %{name}-%{version}-python3/.
 %endif
 
 pushd %{name}-%{version}
@@ -500,36 +402,8 @@
 popd
 popd
 
-%if 0%{?with_python3} > 0
- pushd %{name}-%{version}-python3
- rm -rf build
- mkdir -p build
- pushd build
- %cmake \
- -DBoost_NO_BOOST_CMAKE=TRUE \
- -Wno-fatal-errors -Wno-errors \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_PREFIX_PATH=%{_libdir} \
-%if 0%{?rhel} >= 8 || 0%{?fedora}
- -DQT5_BUILD=ON \
-%endif
- -DINCLUDE_INSTALL_DIR=%{_includedir} \
- -DPYTHON_BINDINGS=ON \
- -DPYTHON_INCLUDE_DIRS=%{python3_include} \
- -DPYTHON_INSTALL_DIR=%{python3_sitearch} \
- ..
- make
- popd
- popd
-%endif
-
-
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
-%else
-for version in 7.4 8.0 8.1 8.2; do
-%endif
+for version in 5.6 7.0 7.1 7.2; do
 pushd %{name}-%{version}-${version}
 rm -rf build
 mkdir -p build
@@ -567,26 +441,15 @@
 mkdir -p \
 %{buildroot}/%{_datadir}/%{php} \
 %{buildroot}/%{php_inidir}/
+mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/%{php}/kolabformat.php
 cat > %{buildroot}/%{php_inidir}/kolabformat.ini << EOF
 extension=kolabformat.so
 EOF
 %endif
 popd
 
-%if 0%{?with_python3} > 0
- pushd %{name}-%{version}-python3
- pushd build
- make install DESTDIR=%{buildroot} INSTALL='install -p'
- popd
- popd
-%endif
-
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
-%else
-for version in 7.4 8.0 8.1 8.2; do
-%endif
+for version in 5.6 7.0 7.1 7.2; do
 pushd %{name}-%{version}-${version}
 pushd build
 make install DESTDIR=%{buildroot} INSTALL='install -p'
@@ -597,6 +460,10 @@
 %{buildroot}/opt/plesk/php/${version}/etc/php.d/ \
 %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
 
+ mv \
+ %{buildroot}/opt/plesk/php/${version}/lib64/php/modules/kolabformat.php \
+ %{buildroot}/opt/plesk/php/${version}/share/php/kolabformat.php
+
 echo "extension=kolabformat.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini
 cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini \
 %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
@@ -609,9 +476,9 @@
 # Make sure libkolabxml.so.* is found, otherwise the tests fail
 export LD_LIBRARY_PATH=$( pwd )/src/
 pushd tests
-./bindingstest
-./conversiontest
-./parsingtest
+./bindingstest ||:
+./conversiontest ||:
+./parsingtest ||:
 popd
 %if 0%{?with_php} > 0
 php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
@@ -621,21 +488,9 @@
 %endif
 popd
 
-%if 0%{?with_python3} > 0
- pushd %{name}-%{version}-python3/build/
- export LD_LIBRARY_PATH=$( pwd )/src/
- python3 src/python/test.py ||:
- popd
-%endif
-
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
-%else
-for version in 7.4 8.0 8.1 8.2; do
-%endif
-
- pushd %{name}-%{version}-${version}/build/
+for version in 5.6 7.0 7.1 7.2; do
+ pushd %{name}-%{version}-5.6/build/
 export LD_LIBRARY_PATH=$( pwd )/src/
 /opt/plesk/php/${version}/bin/php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
 popd
@@ -681,49 +536,40 @@
 %if 0%{?with_php} > 0
 %files -n php-kolabformat
 %defattr(-,root,root,-)
+%{_datadir}/%{php}/kolabformat.php
 %{php_extdir}/kolabformat.so
 %config(noreplace) %{php_inidir}/kolabformat.ini
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 9
-%files -n plesk-php72-kolabformat
+%files -n plesk-php56-kolabformat
 %defattr(-,root,root,-)
-/opt/plesk/php/7.2/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.2/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.2/etc/php-fpm.d/kolabformat.ini
+/opt/plesk/php/5.6/lib64/php/modules/kolabformat.so
+/opt/plesk/php/5.6/share/php/kolabformat.php
+/opt/plesk/php/5.6/etc/php.d/kolabformat.ini
+/opt/plesk/php/5.6/etc/php-fpm.d/kolabformat.ini
 
-%files -n plesk-php73-kolabformat
+%files -n plesk-php70-kolabformat
 %defattr(-,root,root,-)
-/opt/plesk/php/7.3/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.3/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.3/etc/php-fpm.d/kolabformat.ini
+/opt/plesk/php/7.0/lib64/php/modules/kolabformat.so
+/opt/plesk/php/7.0/share/php/kolabformat.php
+/opt/plesk/php/7.0/etc/php.d/kolabformat.ini
+/opt/plesk/php/7.0/etc/php-fpm.d/kolabformat.ini
 
-%endif
-%files -n plesk-php74-kolabformat
+%files -n plesk-php71-kolabformat
 %defattr(-,root,root,-)
-/opt/plesk/php/7.4/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.4/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.4/etc/php-fpm.d/kolabformat.ini
+/opt/plesk/php/7.1/lib64/php/modules/kolabformat.so
+/opt/plesk/php/7.1/share/php/kolabformat.php
+/opt/plesk/php/7.1/etc/php.d/kolabformat.ini
+/opt/plesk/php/7.1/etc/php-fpm.d/kolabformat.ini
 
-%files -n plesk-php80-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/8.0/lib64/php/modules/kolabformat.so
-/opt/plesk/php/8.0/etc/php.d/kolabformat.ini
-/opt/plesk/php/8.0/etc/php-fpm.d/kolabformat.ini
-
-%files -n plesk-php81-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/8.1/lib64/php/modules/kolabformat.so
-/opt/plesk/php/8.1/etc/php.d/kolabformat.ini
-/opt/plesk/php/8.1/etc/php-fpm.d/kolabformat.ini
-
-%files -n plesk-php82-kolabformat
+%files -n plesk-php72-kolabformat
 %defattr(-,root,root,-)
-/opt/plesk/php/8.2/lib64/php/modules/kolabformat.so
-/opt/plesk/php/8.2/etc/php.d/kolabformat.ini
-/opt/plesk/php/8.2/etc/php-fpm.d/kolabformat.ini
+/opt/plesk/php/7.2/lib64/php/modules/kolabformat.so
+/opt/plesk/php/7.2/share/php/kolabformat.php
+/opt/plesk/php/7.2/etc/php.d/kolabformat.ini
+/opt/plesk/php/7.2/etc/php-fpm.d/kolabformat.ini
 
-%endif # if 0%{?plesk}
+%endif
 
 %endif # if 0%{?with_php}
 
@@ -734,23 +580,7 @@
 %{python2_sitearch}/_kolabformat.so
 %endif
 
-%if 0%{?with_python3} > 0
-%files -n python3-kolabformat
-%defattr(-,root,root,-)
-%{python3_sitearch}/kolabformat.py*
-%{python3_sitearch}/_kolabformat.so
-%if 0%{?rhel} >= 8
-%pycached %{python3_sitearch}/kolabformat.py
-%else
-/usr/lib64/python3.6/site-packages/__pycache__/kolabformat.cpython-36.opt-1.pyc
-/usr/lib64/python3.6/site-packages/__pycache__/kolabformat.cpython-36.pyc
-%endif
-%endif
-
 %changelog
-* Tue Feb 15 2022 Christian Mollekopf <mollekopf@kolabsys.com> - 1.2.1
-- Release of version 1.2.1
-
 * Tue May 14 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.0
 - Release of version 1.2.0

debian.changelog Changed

@@ -1,78 +1,3 @@
-libkolabxml (1.3.1-0~kolab3) unstable; urgency=low
-
- * Updated the timezone table
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch> Mon, 19 Feb 2024 16:38:05 +0200
-
-libkolabxml (1.3.0-0~kolab3) unstable; urgency=low
-
- * Load the kolabformat php module after the other kolab modules
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch> Thu, 11 Jan 2024 16:38:05 +0200
-
-libkolabxml (1.3.0-0~kolab2) unstable; urgency=low
-
- * Dropped php < 7.2
- * Added support for php 8.0, 8.1
- * Require swig 4.1
- * New upstream release 1.3.0
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch> Fri, 02 Dez 2022 16:38:05 +0200
-
-libkolabxml (1.2.1-0~kolab3) unstable; urgency=low
-
- * Create Python 3 bindings
-
- -- Christoph Erhardt <kolab@sicherha.de> Sun, 08 May 2022 14:20:01 +0200
-
-libkolabxml (1.2.1-0~kolab1) unstable; urgency=low
-
- * Fix timezone support for timezones with three name elements e.g. America/Indiana/Indianapolis
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Thu, 24 Jun 2021 16:38:05 +0200
-
-libkolabxml (1.2.0-0~kolab11) unstable; urgency=low
-
- * Fix building for distributions without plesk-php70-dev
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Thu, 24 Jun 2021 16:38:05 +0200
-
-libkolabxml (1.2.0-0~kolab10) unstable; urgency=low
-
- * Build with qt5
-
- -- Christian Mollekopf <mollekopf@kolabsys.com> Tue, 9 Feb 2021 16:38:05 +0200
-
-libkolabxml (1.2.0-0~kolab9) unstable; urgency=low
-
- * Fix building for distributions with PHP 5
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Wed, 11 Mar 2020 16:38:05 +0200
-
-libkolabxml (1.2.0-0~kolab8) unstable; urgency=low
-
- * Bionic provided PHP version 7.2
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Mon, 2 Mar 2020 16:38:05 +0200
-
-libkolabxml (1.2.0-0~kolab7) unstable; urgency=low
-
- * Plesk-provided PHP versions 7.3 and 7.4
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Mon, 13 Jan 2020 16:38:05 +0200
-
-libkolabxml (1.2.0-0~kolab5) unstable; urgency=low
-
- * Bindings for multiple versions of Plesk-provided PHP
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Sun, 10 Nov 2019 16:38:05 +0200
-
-libkolabxml (1.2.0-0~kolab3) unstable; urgency=low
-
- * Debian 10 support
-
- -- Daniel Hoffend <dh@dotlan.net> Sat, 9 Nov 2019 02:28:24 +0100
-
 libkolabxml (1.2.0-0~kolab2) unstable; urgency=low
 
 * Release 1.2.0

debian.control Changed

@@ -1,33 +1,22 @@
 Source: libkolabxml
 Section: libs
 Priority: optional
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Build-Depends: cmake,
- debhelper,
- extra-cmake-modules,
- dh-python,
- libboost-dev,
- libboost-system-dev,
- libboost-thread-dev,
- libcurl4-gnutls-dev,
- libossp-uuid-dev,
- qtbase5-dev,
- libxerces-c-dev,
- php-cgi,
- php-dev,
- plesk-php72-dev | bash,
- plesk-php73-dev | bash,
- plesk-php74-dev | bash,
- plesk-php80-dev | bash,
- plesk-php81-dev | bash,
- plesk-php82-dev | bash,
- psa | bash,
- python2-dev | python-dev| python3-dev,
- python-minimal | python2-minimal| python3-minimal,
- python3-all-dev,
- swig4.0 (>= 4.1),
- xsdcxx
+Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org>
+Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Build-Depends: cmake,
+ debhelper,
+ libboost-dev,
+ libboost-system-dev,
+ libboost-thread-dev,
+ libcurl4-gnutls-dev,
+ libossp-uuid-dev,
+ libqt4-dev,
+ libxerces-c-dev,
+ php-cgi | php5-cli,
+ php-dev | php5-dev,
+ python-dev,
+ swig (>= 2.0),
+ xsdcxx
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.3
 Homepage: http://git.kolab.org/libkolabxml
@@ -52,25 +41,24 @@
 	${shlibs:Depends},
 	${php:Depends},
 	ucf
-Provides: php-bindings-libkolabxml
 Description: PHP bindings for Kolab Format 3.0 XML parsing
 Libkolabxml is the reference implementation of the Kolab XML format
 For more information see the libkolabxml package.
 .
 This package provides PHP bindings for libkolabxml
 
-Package: python3-kolabformat
+Package: python-kolabformat
 Architecture: any
 Section: python
 Depends: libkolabxml1v5 (= ${binary:Version}),
-	${python3:Depends},
+	python,
 	${misc:Depends},
 	${shlibs:Depends}
-Description: Python 3 bindings for Kolab Format 3.0 XML parsing
+Description: Python bindings for Kolab Format 3.0 XML parsing
 Libkolabxml is the reference implementation of the Kolab XML format.
 For more information see the libkolabxml package.
 .
- This package provides Python 3 bindings for libkolabxml
+ This package provides Python bindings for libkolabxml
 
 Package: libkolabxml-dev
 Section: libdevel

debian.rules Changed

@@ -1,182 +1,46 @@
 #!/usr/bin/make -f
 
 PHPAPI := $(shell php-config --phpapi)
-PHPBIN := $(shell php-config --php-binary)
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
+PYTHON_SITEARCH := $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
 
-PHP_VERSIONS=8.2 8.1 8.0 7.4 7.3 7.2
-
+# Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
 export DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed"
 
 %:
-	python3 utils/zonetabconversion.py
-	if  -f /usr/bin/python  ; then \
-        dh $@ --parallel --with python2,python3 --buildsystem=pybuild ; \
-    else \
-        dh $@ --parallel --with python3 --buildsystem=pybuild ; \
-    fi
+	python utils/zonetabconversion.py
+	dh $@ --parallel --with python2
 
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolabformat.substvars
-
-	if  -f /etc/plesk-release  ; then \
-		for version in $(PHP_VERSIONS) ; do \
-			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
-				continue ; \
-			fi ; \
-			shver=$$(echo $${version} | sed -e 's/\.//g') ; \
-			echo "" >> debian/control ; \
-			echo "Package: plesk-php$${shver}-kolabformat" >> debian/control ; \
-			echo "Architecture: amd64" >> debian/control ; \
-			echo "Depends: libkolabxml1v5, plesk-php$${shver}" >> debian/control ; \
-			echo "Provides: php-bindings-libkolabxml" >> debian/control ; \
-			echo "Description: Kolab format bindings for Plesk PHP $${version}" >> debian/control ; \
-			echo "" >> debian/control ; \
-			sed -i -e "/Files:/ i\
- plesk-php$${shver}-kolabformat deb web extra" debian/control ; \
-			echo "opt/plesk/php/$${version}/lib/php/modules/*.so" >> debian/plesk-php$${shver}-kolabformat.install ; \
-			echo "debian/kolabformat.ini opt/plesk/php/$${version}/etc/php.d" >> debian/plesk-php$${shver}-kolabformat.install ; \
-		done ; \
-	fi
-	if  -f /usr/bin/python  ; then \
-        echo "" >> debian/control ; \
-        echo "Package: python-kolabformat" >> debian/control ; \
-        echo "Architecture: any" >> debian/control ; \
-        echo "Depends: libkolabxml1v5 (= ${binary:Version}), python, ${misc:Depends}, ${shlibs:Depends}" >> debian/control ; \
-        echo "Provides: php-bindings-libkolabxml" >> debian/control ; \
-        echo "Description: Python bindings for Kolab Format 3.0 XML parsing" >> debian/control ; \
-        echo "" >> debian/control ; \
-    fi
-
 	dh_gencontrol
 
-override_dh_auto_build:
-	# Build plesk php versions
-	if  -f /etc/plesk-release  ; then \
-		for version in $(PHP_VERSIONS) ; do \
-			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
-				continue ; \
-			fi ; \
-			if  $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \
-				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
-			else \
-				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
-			fi ; \
-			dh_auto_build --buildsystem cmake --builddirectory php-$${version} ; \
-		done ; \
-	fi
-
-	# Build php vanilla
-	if  $$(php-config --vernum) -gt 70000 ; then \
-		sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
-	else \
-		sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
-	fi
-
-	dh_auto_build --buildsystem cmake --builddirectory php-vanilla
-
-	# Build python versions via pybuild
-	dh_auto_build
-
 override_dh_auto_configure:
-	echo 9 > debian/compat
-	if  -f /etc/plesk-release  ; then \
-		for version in $(PHP_VERSIONS) ; do \
-			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
-				continue ; \
-			fi ; \
-			if  $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \
-				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
-			else \
-				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
-			fi ; \
-			dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- -DLIB_INSTALL_DIR=/usr/lib \
-				-DQT5_BUILD=ON \
-				-DBoost_NO_BOOST_CMAKE=ON \
-				-DSWIG=/usr/bin/swig \
-				-DPHP_BINDINGS=ON \
-				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
-				-DPHP_CONFIG_EXECUTABLE=/opt/plesk/php/$${version}/bin/php-config \
-				-DPHP_EXECUTABLE=/opt/plesk/php/$${version}/bin/php \
-				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
-				-DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir) ; \
-		done ; \
-	fi
-
-	# Configure php vanilla
 	if  $$(php-config --vernum) -gt 70000 ; then \
-		sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
-	else \
-		sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
+		sed -i -e 's/-c++ -php/-c++ -php7/g' src/php/CMakeLists.txt ; \
 	fi
 
-	grep kolabformat.i src/php/CMakeLists.txt
-
-	dh_auto_configure --buildsystem cmake --builddirectory php-vanilla -- \
-		-DLIB_INSTALL_DIR=/usr/lib \
-		-DQT5_BUILD=ON \
-		-DBoost_NO_BOOST_CMAKE=ON \
+	dh_auto_configure -- \
+		-DSWIG=/usr/bin/swig \
 		-DPHP_BINDINGS=ON \
-		-DPHP_INSTALL_DIR=$(PHPEXT) \
-		-DPHP_EXECUTABLE=$(PHPBIN) \
-		-DPHP_INCLUDE_DIR=$(PHPINC)
-
-	# Configure python builds via pybuild
-	dh_auto_configure -- --configure-args \
-		"-DLIB_INSTALL_DIR=/usr/lib \
-		-DQT5_BUILD=ON \
-		-DBoost_NO_BOOST_CMAKE=ON \
+		-DPHP_INCLUDE_DIR=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
-		-DPYTHON_INSTALL_DIR={install_dir}"
+		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
 
 override_dh_install:
-	# Install the PHP modules manually, because they depend on the  PHP API version,
-	# which has to be determined dynamically, so we can't put it into an .install file.
 	mkdir -p debian/tmp/usr/share/php
-	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
-
-	if  -d "/etc/php/8.2/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/8.2/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/8.1/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/8.1/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/8.0/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/8.0/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/7.4/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/7.4/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/7.3/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/7.3/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/7.2/mods-available/" ; then \
+	if  -d "/etc/php/7.2/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/7.2/mods-available" >> debian/php-kolabformat.install ; \
-	else \
+	elif  -d "/etc/php/7.0/mods-available/" ; then \
+		echo "debian/kolabformat.ini etc/php/7.0/mods-available" >> debian/php-kolabformat.install ; \
+	elif  -d "/etc/php/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/mods-available" >> debian/php-kolabformat.install ; \
+	else \
+		echo "debian/kolabformat.ini etc/php5/mods-available" >> debian/php-kolabformat.install ; \
 	fi
-
-	if  -f /etc/plesk-release ; then \
-		for version in $(PHP_VERSIONS) ; do \
-			if  ! -f "/opt/plesk/php/$${version}/bin/php-config" ; then \
-				continue ; \
-			fi ; \
-			if  $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \
-				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php7 -o/g' src/php/CMakeLists.txt ; \
-			else \
-				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
-			fi ; \
-			shver=$$(echo $${version} | sed -e 's/\.//g') ; \
-			make -C php-$${version} install DESTDIR=$(PWD)/debian/plesk-php$${shver}-kolabformat/ ; \
-			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
-			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/ ; \
-			cp -a debian/kolabformat.ini debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
-			rm -rvf debian/plesk-php$${shver}-kolabformat/usr/ ; \
-			find debian/plesk-php$${shver}-kolabformat/ | sort ; \
-		done ; \
-	fi
-
+	mv debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
 	dh_install --list-missing
-
-override_dh_auto_test:
-    # Fails on ubuntu 20.04 and debian 10 because of missing qt libraries
-	dh_auto_test || :

debian.tar.gz/kolabformat.ini Changed

debian.tar.gz/libkolabxml-dev.install Changed

debian.tar.gz/libkolabxml1v5.install Changed

debian.tar.gz/php-kolabformat.install Changed

debian.tar.gz/php-kolabformat.postinst Changed

debian.tar.gz/python-kolabformat.install Changed

debian.tar.gz/python3-kolabformat.install Deleted

libkolabxml-1.3.1.tar.gz/CMakeLists.txt -> libkolabxml-1.2.0.tar.gz/CMakeLists.txt Changed

@@ -38,9 +38,9 @@
 # 0.2 (0.2 development version)
 
 set (Libkolabxml_VERSION_MAJOR 1)
-set (Libkolabxml_VERSION_MINOR 3)
+set (Libkolabxml_VERSION_MINOR 2)
 # Enable the full x.y.z version only for release versions
-set (Libkolabxml_VERSION_PATCH 1)
+set (Libkolabxml_VERSION_PATCH 0)
 set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" )
 #set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" )
 
@@ -145,7 +145,7 @@
 # --generate-inline --extern-xml-schema xml-schema.xsd
 # --cxx-suffix .cpp --hxx-suffix .h   
 add_custom_command(OUTPUT ${SCHEMA_SOURCEFILES}
-    COMMAND ${XSDCXX} cxx-tree --std c++11 --generate-polymorphic --generate-serialization  --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --root-element file --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS}
+    COMMAND ${XSDCXX} cxx-tree --generate-polymorphic --generate-serialization  --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --root-element file --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS}
     COMMENT "Generating XSD bindings"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     DEPENDS ${SCHEMAS}

libkolabxml-1.3.1.tar.gz/compiled/XMLParserWrapper.cpp -> libkolabxml-1.2.0.tar.gz/compiled/XMLParserWrapper.cpp Changed

@@ -17,7 +17,7 @@
 
 #include "XMLParserWrapper.h"
 
-#include <memory> // std::unique_ptr
+#include <memory> // std::auto_ptr
 #include <fstream>
 #include <iostream>
 
@@ -226,7 +226,7 @@
 
 }
 
-std::unique_ptr< xercesc::DOMDocument > XMLParserWrapper::parseFile(const std::string& url)
+xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument > XMLParserWrapper::parseFile(const std::string& url)
 {
 try {
 std::ifstream ifs;
@@ -237,17 +237,17 @@
 {
 std::cerr << ": unable to open or read failure" << std::endl;
 }
- return std::unique_ptr< xercesc::DOMDocument >();
+ return xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument >();
 }
 
-std::unique_ptr< xercesc::DOMDocument > XMLParserWrapper::parseString(const std::string& s)
+xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument > XMLParserWrapper::parseString(const std::string& s)
 {
 std::istringstream is(s);
 return parse(is, ""); //TODO set identifier?
 }
 
 
-std::unique_ptr<xercesc::DOMDocument> XMLParserWrapper::parse(std::istream &ifs, const std::string &name)
+xml_schema::dom::auto_ptr<xercesc::DOMDocument> XMLParserWrapper::parse(std::istream &ifs, const std::string &name)
 {
 using namespace std;
 
@@ -268,9 +268,9 @@
 // Parse XML to DOM.
 //
 #if _XERCES_VERSION >= 30000
- std::unique_ptr<DOMDocument> doc (parser->parse (&wrap));
+ xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (&wrap));
 #else
- std::unique_ptr<DOMDocument> doc (parser->parse (wrap));
+ xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (wrap));
 #endif
 
 eh.throw_if_failed<xml_schema::parsing> ();
@@ -291,5 +291,5 @@
 cerr << ": unknown exception thrown" << endl;
 }
 eh.reset();
- return std::unique_ptr<xercesc::DOMDocument>();
+ return xml_schema::dom::auto_ptr<xercesc::DOMDocument>();
 }

libkolabxml-1.3.1.tar.gz/compiled/XMLParserWrapper.h -> libkolabxml-1.2.0.tar.gz/compiled/XMLParserWrapper.h Changed

libkolabxml-1.3.1.tar.gz/compiled/xsdbin.cxx -> libkolabxml-1.2.0.tar.gz/compiled/xsdbin.cxx Changed

libkolabxml-1.3.1.tar.gz/src/CMakeLists.txt -> libkolabxml-1.2.0.tar.gz/src/CMakeLists.txt Changed

libkolabxml-1.3.1.tar.gz/src/containers/kolabcontainers.cpp -> libkolabxml-1.2.0.tar.gz/src/containers/kolabcontainers.cpp Changed

libkolabxml-1.3.1.tar.gz/src/kolabconversions.h -> libkolabxml-1.2.0.tar.gz/src/kolabconversions.h Changed

@@ -409,16 +409,16 @@
 boost::shared_ptr<Kolab::Note> deserializeObject <Kolab::Note> (const std::string& s, bool isUrl)
 {
 try {
- std::unique_ptr<KolabXSD::Note> note;
+ std::auto_ptr<KolabXSD::Note> note;
 if (isUrl) {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- note = KolabXSD::note(*doc);
+ note = KolabXSD::note(doc);
 }
 } else {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- note = KolabXSD::note(*doc);
+ note = KolabXSD::note(doc);
 }
 }
 
@@ -499,16 +499,16 @@
 boost::shared_ptr<Kolab::Configuration> deserializeObject <Kolab::Configuration> (const std::string& s, bool isUrl)
 {
 try {
- std::unique_ptr<KolabXSD::Configuration> configuration;
+ std::auto_ptr<KolabXSD::Configuration> configuration;
 if (isUrl) {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- configuration = KolabXSD::configuration(*doc);
+ configuration = KolabXSD::configuration(doc);
 }
 } else {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- configuration = KolabXSD::configuration(*doc);
+ configuration = KolabXSD::configuration(doc);
 }
 }
 
@@ -629,16 +629,16 @@
 boost::shared_ptr<Kolab::File> deserializeObject <Kolab::File> (const std::string& s, bool isUrl)
 {
 try {
- std::unique_ptr<KolabXSD::File> file;
+ std::auto_ptr<KolabXSD::File> file;
 if (isUrl) {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- file = KolabXSD::file(*doc);
+ file = KolabXSD::file(doc);
 }
 } else {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- file = KolabXSD::file(*doc);
+ file = KolabXSD::file(doc);
 }
 }

libkolabxml-1.3.1.tar.gz/src/php/CMakeLists.txt -> libkolabxml-1.2.0.tar.gz/src/php/CMakeLists.txt Changed

libkolabxml-1.3.1.tar.gz/src/xcalconversions.h -> libkolabxml-1.2.0.tar.gz/src/xcalconversions.h Changed

@@ -132,9 +132,9 @@
 }
 
 template <typename T>
-std::unique_ptr<T> fromStringList(const std::vector<std::string> &list)
+std::auto_ptr<T> fromStringList(const std::vector<std::string> &list)
 {
- std::unique_ptr<T> ptr(new T());
+ std::auto_ptr<T> ptr(new T());
 std::copy(list.begin(), list.end(), std::back_inserter(ptr->text()));
 return ptr;
 }
@@ -509,9 +509,9 @@
 }
 
 template <typename I>
-std::unique_ptr fromDate(const cDateTime &dt)
+std::auto_ptr fromDate(const cDateTime &dt)
 {
- std::unique_ptr ptr(new I);
+ std::auto_ptr ptr(new I);
 if (dt.isDateOnly()) {
 ptr->date(Shared::fromDate(dt));
 } else {
@@ -557,10 +557,10 @@
 }
 
 template <typename I>
-std::unique_ptr fromDateTimeList(const std::vector<cDateTime> &dtlist)
+std::auto_ptr fromDateTimeList(const std::vector<cDateTime> &dtlist)
 {
 
- std::unique_ptr ptr(new I);
+ std::auto_ptr ptr(new I);
 BOOST_FOREACH(const cDateTime &dt, dtlist) {
 if (dt.isDateOnly()) {
 ptr->date().push_back(Shared::fromDate(dt));
@@ -678,7 +678,7 @@
 
 //=== Recurrence Rule ===
 
- typedef std::unique_ptr<RecurrenceRule> RecurrencePtr;
+ typedef std::auto_ptr<RecurrenceRule> RecurrencePtr;
 
 
 RecurrenceRule::Frequency mapRecurrenceFrequency(const icalendar_2_0::RecurType::freq_type &freq)
@@ -1031,11 +1031,11 @@
 return list;
 }
 
-std::unique_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const RecurrenceRule &r)
+std::auto_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const RecurrenceRule &r)
 {
 using namespace icalendar_2_0;
 
- std::unique_ptr< RrulePropType > rruleProp(new RrulePropType(mapRecurrenceFrequency(r.frequency())));
+ std::auto_ptr< RrulePropType > rruleProp(new RrulePropType(mapRecurrenceFrequency(r.frequency())));
 
 RecurPropertyType::recur_type &recur = rruleProp->recur();
 const cDateTime &endDate = r.end();
@@ -1271,7 +1271,7 @@
 }
 
 if (inc.recurrenceID().isValid()) {
- std::unique_ptr<typename properties::recurrence_id_type> recurrenceId = fromDate<typename properties::recurrence_id_type>(inc.recurrenceID());
+ std::auto_ptr<typename properties::recurrence_id_type> recurrenceId = fromDate<typename properties::recurrence_id_type>(inc.recurrenceID());
 if (inc.thisAndFuture()) {
 if (!recurrenceId->parameters()) {
 recurrenceId->parameters(typename properties::recurrence_id_type::parameters_type());
@@ -1281,7 +1281,7 @@
 parameters.baseParameter().push_back(range);
 }
 
- prop.recurrence_id(std::move(recurrenceId));
+ prop.recurrence_id(recurrenceId);
 }
 
 if (inc.priority() != 0) {
@@ -1332,14 +1332,14 @@
 trigger.parameters(parameters);
 }
 
- std::unique_ptr<PropType> p;
+ std::auto_ptr<PropType> p;
 switch(alarm.type()) {
 case Kolab::Alarm::DisplayAlarm:
- p = std::unique_ptr<PropType>(new PropType(PropType::action_type(DISPLAYALARM), trigger));
+ p = std::auto_ptr<PropType>(new PropType(PropType::action_type(DISPLAYALARM), trigger));
 p->description(PropType::description_type(alarm.description()));
 break;
 case Kolab::Alarm::EMailAlarm: {
- p = std::unique_ptr<PropType>(new PropType(PropType::action_type(EMAILALARM), trigger));
+ p = std::auto_ptr<PropType>(new PropType(PropType::action_type(EMAILALARM), trigger));
 p->summary(PropType::summary_type(alarm.summary()));
 p->description(PropType::description_type(alarm.description()));
 const std::vector<Kolab::ContactReference> &l = alarm.attendees();
@@ -1349,7 +1349,7 @@
 break;
 }
 case Kolab::Alarm::AudioAlarm:
- p = std::unique_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
+ p = std::auto_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
 p->description(PropType::description_type(alarm.description()));
 if (alarm.audioFile().isValid()) {
 p->attach(fromAttachment(alarm.audioFile()));
@@ -1363,7 +1363,7 @@
 p->repeat(PropType::repeat_type(fromInt<PropType::repeat_type::integer_type>(alarm.numrepeat())));
 }
 
- components.valarm().push_back(icalendar_2_0::ValarmType(std::move(p)));
+ components.valarm().push_back(icalendar_2_0::ValarmType(p));
 }
 }
 
@@ -1926,19 +1926,19 @@
 typedef typename T::KolabType KolabType;
 
 try {
- std::unique_ptr<icalendar_2_0::IcalendarType> icalendar;
+ std::auto_ptr<icalendar_2_0::IcalendarType> icalendar;
 if (isUrl) {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- icalendar = icalendar_2_0::icalendar(*doc);
+ icalendar = icalendar_2_0::icalendar(doc);
 }
 } else {
- std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- icalendar = icalendar_2_0::icalendar(*doc);
+ icalendar = icalendar_2_0::icalendar(doc);
 }
 }
-
+ 
 if (!icalendar.get()) {
 CRITICAL("Failed to parse calendar!");
 return IncidencePtr();

libkolabxml-1.3.1.tar.gz/src/xcardconversions.h -> libkolabxml-1.2.0.tar.gz/src/xcardconversions.h Changed

libkolabxml-1.3.1.tar.gz/tests/CMakeLists.txt -> libkolabxml-1.2.0.tar.gz/tests/CMakeLists.txt Changed

libkolabxml-1.3.1.tar.gz/tests/validationtest.cpp -> libkolabxml-1.2.0.tar.gz/tests/validationtest.cpp Changed

libkolabxml-1.3.1.tar.gz/tests/validationtest.h -> libkolabxml-1.2.0.tar.gz/tests/validationtest.h Changed

libkolabxml-1.3.1.tar.gz/tztable.h -> libkolabxml-1.2.0.tar.gz/tztable.h Changed

@@ -59,19 +59,6 @@
     "America/Anguilla",
     "America/Antigua",
     "America/Araguaina",
-    "America/Argentina/Buenos_Aires",
-    "America/Argentina/Catamarca",
-    "America/Argentina/ComodRivadavia",
-    "America/Argentina/Cordoba",
-    "America/Argentina/Jujuy",
-    "America/Argentina/La_Rioja",
-    "America/Argentina/Mendoza",
-    "America/Argentina/Rio_Gallegos",
-    "America/Argentina/Salta",
-    "America/Argentina/San_Juan",
-    "America/Argentina/San_Luis",
-    "America/Argentina/Tucuman",
-    "America/Argentina/Ushuaia",
     "America/Aruba",
     "America/Asuncion",
     "America/Atikokan",
@@ -95,7 +82,6 @@
     "America/Cayman",
     "America/Chicago",
     "America/Chihuahua",
-    "America/Ciudad_Juarez",
     "America/Coral_Harbour",
     "America/Cordoba",
     "America/Costa_Rica",
@@ -127,22 +113,12 @@
     "America/Halifax",
     "America/Havana",
     "America/Hermosillo",
-    "America/Indiana/Indianapolis",
-    "America/Indiana/Knox",
-    "America/Indiana/Marengo",
-    "America/Indiana/Petersburg",
-    "America/Indiana/Tell_City",
-    "America/Indiana/Vevay",
-    "America/Indiana/Vincennes",
-    "America/Indiana/Winamac",
     "America/Indianapolis",
     "America/Inuvik",
     "America/Iqaluit",
     "America/Jamaica",
     "America/Jujuy",
     "America/Juneau",
-    "America/Kentucky/Louisville",
-    "America/Kentucky/Monticello",
     "America/Knox_IN",
     "America/Kralendijk",
     "America/La_Paz",
@@ -173,10 +149,6 @@
     "America/Nipigon",
     "America/Nome",
     "America/Noronha",
-    "America/North_Dakota/Beulah",
-    "America/North_Dakota/Center",
-    "America/North_Dakota/New_Salem",
-    "America/Nuuk",
     "America/Ojinaga",
     "America/Panama",
     "America/Pangnirtung",
@@ -235,6 +207,19 @@
     "Antarctica/Troll",
     "Antarctica/Vostok",
     "Arctic/Longyearbyen",
+    "Argentina/Buenos_Aires",
+    "Argentina/Catamarca",
+    "Argentina/ComodRivadavia",
+    "Argentina/Cordoba",
+    "Argentina/Jujuy",
+    "Argentina/La_Rioja",
+    "Argentina/Mendoza",
+    "Argentina/Rio_Gallegos",
+    "Argentina/Salta",
+    "Argentina/San_Juan",
+    "Argentina/San_Luis",
+    "Argentina/Tucuman",
+    "Argentina/Ushuaia",
     "Asia/Aden",
     "Asia/Almaty",
     "Asia/Amman",
@@ -450,7 +435,6 @@
     "Europe/Kaliningrad",
     "Europe/Kiev",
     "Europe/Kirov",
-    "Europe/Kyiv",
     "Europe/Lisbon",
     "Europe/Ljubljana",
     "Europe/London",
@@ -511,10 +495,20 @@
     "Indian/Mauritius",
     "Indian/Mayotte",
     "Indian/Reunion",
+    "Indiana/Indianapolis",
+    "Indiana/Knox",
+    "Indiana/Marengo",
+    "Indiana/Petersburg",
+    "Indiana/Tell_City",
+    "Indiana/Vevay",
+    "Indiana/Vincennes",
+    "Indiana/Winamac",
     "Iran",
     "Israel",
     "Jamaica",
     "Japan",
+    "Kentucky/Louisville",
+    "Kentucky/Monticello",
     "Kwajalein",
     "Libya",
     "MET",
@@ -526,6 +520,9 @@
     "NZ",
     "NZ-CHAT",
     "Navajo",
+    "North_Dakota/Beulah",
+    "North_Dakota/Center",
+    "North_Dakota/New_Salem",
     "PRC",
     "PST8PDT",
     "Pacific/Apia",
@@ -545,7 +542,6 @@
     "Pacific/Guam",
     "Pacific/Honolulu",
     "Pacific/Johnston",
-    "Pacific/Kanton",
     "Pacific/Kiritimati",
     "Pacific/Kosrae",
     "Pacific/Kwajalein",
@@ -590,6 +586,7 @@
     "US/Michigan",
     "US/Mountain",
     "US/Pacific",
+    "US/Pacific-New",
     "US/Samoa",
     "UTC",
     "Universal",

libkolabxml-1.3.1.tar.gz/utils/zonetabconversion.py -> libkolabxml-1.2.0.tar.gz/utils/zonetabconversion.py Changed

libkolabxml-1.3.1.tar.gz/utils/kolabformatchecker.py Deleted

@@ -1,157 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import email
-from os import listdir
-from os.path import isfile, join, basename
-import kolabformat
-
-
-
-def check_file(filename, messageType, objectType, verbose):
-    if filename.endswith(args.fileType):
-        if verbose:
-            print("NAME %s" % filename)
-
-    if messageType == 'mime':
-        f = open(filename, "r")
-        msg = email.message_from_string(f.read())
-
-        kolabType = msg.get('X-Kolab-Type')
-        if not kolabType:
-            print("Missing kolab type X-Kolab-Type")
-        elif verbose:
-            print("Found X-Kolab-Type ", kolabType)
-
-        version = msg.get('X-Kolab-Mime-Version')
-        if not version:
-            print("Missing kolab type X-Kolab-Mime-Version")
-        elif verbose:
-            print("Found X-Kolab-Mime-Version ", version)
-
-        for part in msg.walk():
-            if part.get_content_type() in 
-                    'application/calendar+xml',
-                    'application/vcard+xml',
-                    'application/vnd.kolab+xml',
-                    'application/x-vnd.kolab.contact.distlist',
-                    'application/x-vnd.kolab.contact':
-                xml = part.get_payload(decode=True)
-                try:
-                    xml = xml.decode('utf-8')
-                except UnicodeDecodeError as err:
-                    print("Failed to decode as utf-8", err, filename, xml)
-                    print()
-                    try:
-                        xml = xml.decode('cp1252')
-                        print("cp1252 fallback worked", err, filename, xml)
-                    except UnicodeDecodeError as err:
-                        print("Failed to decode as cp1252", err, filename, xml)
-                        print()
-                        # Final fallback, just replace the characters we fail to decode
-                        xml = xml.decode('utf-8', "replace")
-
-                if verbose:
-                    print("Content type of part is ", part.get_content_type())
-                    print("Filename of part is ", part.get_filename())
-                    print("Found xml \n%s" % xml)
-
-        isPath = False
-    else:
-        xml = filename
-        isPath = True
-
-    if objectType == 'auto':
-        if kolabType is None:
-            raise Exception("Failed to detect the object type")
-        elif 'event' in kolabType:
-            objectType = 'event'
-        elif 'todo' in kolabType:
-            objectType = 'todo'
-        elif 'contact' in kolabType:
-            objectType = 'contact'
-        elif 'note' in kolabType:
-            objectType = 'note'
-        elif 'journal' in kolabType:
-            objectType = 'journal'
-        elif 'configuration' in kolabType:
-            objectType = 'configuration'
-        else:
-            raise Exception("Invalid object type")
-
-
-    if objectType == 'event':
-        kolabObject = kolabformat.readEvent(xml, isPath)
-        if verbose:
-            print("Event uid is: %s" % kolabObject.uid())
-            print("Event is valid: %s" % kolabObject.isValid())
-            print("Event start_date is valid: %s" % kolabObject.start().isValid())
-            print("Event end_date is valid: %s" % kolabObject.end().isValid())
-            print("Event URL is: %s" % kolabObject.url())
-            print("Event summary is: %s" % kolabObject.summary())
-            print("Event description is: %s" % kolabObject.description())
-            print("Event comment is: %s" % kolabObject.comment())
-    elif objectType == 'todo':
-        kolabObject = kolabformat.readTodo(xml, isPath)
-    elif objectType == 'contact':
-        kolabObject = kolabformat.readContact(xml, isPath)
-    elif objectType == 'journal':
-        kolabObject = kolabformat.readJournal(xml, isPath)
-    elif objectType == 'distlist':
-        kolabObject = kolabformat.readDistlist(xml, isPath)
-    elif objectType == 'note':
-        kolabObject = kolabformat.readNote(xml, isPath)
-    elif objectType == 'configuration':
-        kolabObject = kolabformat.readConfiguration(xml, isPath)
-    elif objectType == 'file':
-        kolabObject = kolabformat.readFile(xml, isPath)
-    else:
-        print("Unknown object type", objectType, filename)
-        raise Exception("Unknown object type")
-
-    if kolabformat.error():
-        raise Exception(kolabformat.errorMessage())
-
-    print("Successfully parsed file %s with kolab object %s" %
-        (basename(filename), kolabObject.uid())
-    )
-
-
-parser = argparse.ArgumentParser(description='Check kolab xml objects.')
-
-parser.add_argument('--messagetype', '-m',
-        dest='messageType',
-        choices='xml', 'mime',
-        required=True,
-        help='The type of the object to parse')
-parser.add_argument('--kolabtype', '-k',
-        dest='kolabType',
-        choices='event', 'todo', 'contact', 'journal', 'distlist', 'note', 'configuration', 'file', 'auto',
-        required=True,
-        help='The type of the object to parse ("auto" only for mime messages)')
-parser.add_argument('--verbose', '-v',
-        dest='verbose',
-        default=False,
-        action='store_true',
-        help='Verbose output')
-parser.add_argument('-p', '--path',
-        dest='path',
-        required=True,
-        help='The file to read')
-parser.add_argument('-f', '--filetype',
-        dest='fileType',
-        default='',
-        help='Pattern for file name/type matching in directory')
-
-args = parser.parse_args()
-
-if isfile(args.path):
-    filenames = args.path
-else:
-    filenames = join(args.path, fn) for fn in listdir(args.path)
-
-for filename in filenames:
-    try:
-        check_file(filename, args.messageType, args.kolabType, args.verbose)
-    except Exception as e:
-        print("There was an error while parsing ", e, filename)

libkolabxml.dsc Changed

@@ -2,41 +2,30 @@
 Source: libkolabxml
 Binary: libkolabxml1v5, php-kolabformat, python-kolabformat, libkolabxml-dev
 Architecture: any
-Version: 1.3.1-0~kolab3
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
+Version: 1.2.0-0~kolab2
+Maintainer: Kolab Systems AG <contact@kolabsystems.com>
+Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Homepage: http://git.kolab.org/libkolabxml
 Standards-Version: 3.9.3
-Build-Depends: cmake,
- debhelper,
- extra-cmake-modules,
- dh-python,
- libboost-dev,
- libboost-system-dev,
- libboost-thread-dev,
- libcurl4-gnutls-dev,
- libossp-uuid-dev,
- qtbase5-dev,
- libxerces-c-dev,
- php-cgi,
- php-dev,
- psa | bash,
- plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
- plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
- plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
- plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
- plesk-php81-dev | plesk-php82-dev | bash,
- plesk-php82-dev | bash,
- python2-dev | python-dev | python3-dev,
- python-minimal | python2-minimal | python3-minimal,
- python3-all-dev,
- swig4.0 (>= 4.1),
- xsdcxx
-Package-List:
+Build-Depends: cmake,
+ debhelper,
+ libboost-dev,
+ libboost-system-dev,
+ libboost-thread-dev,
+ libcurl4-gnutls-dev,
+ libossp-uuid-dev,
+ libqt4-dev,
+ libxerces-c-dev,
+ php-cgi | php5-cli,
+ php-dev | php5-dev,
+ python-dev,
+ swig (>= 2.0),
+ xsdcxx
+Package-List: 
 libkolabxml-dev deb libdevel optional
 libkolabxml1v5 deb libs optional
 php-kolabformat deb libs optional
 python-kolabformat deb python optional
-Files:
- 00000000000000000000000000000000 0 libkolabxml-1.3.1.tar.gz
+Files: 
+ 00000000000000000000000000000000 0 libkolabxml-1.2.0.tar.gz
 00000000000000000000000000000000 0 debian.tar.gz

Overview

Request 2528 (superseded)

Request History