Projects
Kolab:16:TestingLinked
libkolabxml
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 7
View file
libkolabxml.spec
Changed
@@ -14,6 +14,8 @@ %global with_php 1 %global with_python 1 +%{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 @@ -72,6 +74,9 @@ # From fa555615bd732cdc7fef56bf617e57d1bcf174fd Source0: libkolabxml-1.2.tar.gz +Patch1001: fix-qverify-argument.patch +Patch1002: at11.0-boost-this_thread-hidden-sleep_until.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: boost-devel @@ -235,9 +240,14 @@ %prep %setup -q -n libkolabxml-%{version} -%if 0%{?fedora} >= 25 +%patch1001 -p1 + +%if 0%{?with_at} +%patch1002 -p1 +%endif + +%if 0%{?with_php7} sed -i "s/-php/-php7/g" src/php/CMakeLists.txt -sed -i "s/QVERIFY(ptr)/QVERIFY(ptr != NULL)/g" tests/kolabconversationtest.cpp %endif %build
View file
at11.0-boost-this_thread-hidden-sleep_until.patch
Added
@@ -0,0 +1,12 @@ +diff -ur libkolabxml-1.2.orig/tests/conversiontest.cpp libkolabxml-1.2/tests/conversiontest.cpp +--- libkolabxml-1.2.orig/tests/conversiontest.cpp 2016-09-09 12:42:25.000000000 +0200 ++++ libkolabxml-1.2/tests/conversiontest.cpp 2017-10-05 09:50:08.497369485 +0200 +@@ -263,7 +263,7 @@ + std::string uid = s.str(); + // std::cout << uid << std::endl; + Kolab::Utils::setCreatedUid(uid); +- boost::this_thread::sleep(boost::posix_time::millisec(50)); ++// boost::this_thread::sleep(boost::posix_time::millisec(50)); + QCOMPARE(Kolab::Utils::createdUid(), uid); + } + }
View file
debian.changelog
Changed
@@ -1,5 +1,11 @@ libkolabxml (1.2~dev20160909-0~kolab7) unstable; urgency=low + * Ubuntu 18.04 support + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 4 Oct 2018 16:38:05 +0200 + +libkolabxml (1.2~dev20160909-0~kolab7) unstable; urgency=low + * Fix warnings caused by duplicate configuration-file symlinks -- Christoph Erhardt <kolab@sicherha.de> Sun, 04 Jun 2017 12:02:01 +0200
View file
debian.rules
Changed
@@ -32,7 +32,9 @@ override_dh_install: mkdir -p debian/tmp/usr/share/php - if -d "/etc/php/7.0/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 ; \ + 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 ; \
View file
libkolabxml.dsc
Changed
@@ -2,7 +2,7 @@ Source: libkolabxml Binary: libkolabxml1v5, php-kolabformat, python-kolabformat, libkolabxml-dev Architecture: any -Version: 1.2~dev20160909-0~kolab7 +Version: 1.2~dev20160909-0~kolab8 Maintainer: Kolab Systems AG <contact@kolabsystems.com> Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Homepage: http://git.kolab.org/libkolabxml
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.