Kolab Groupware OBS

libkolabxml.spec Changed

@@ -30,8 +30,8 @@
 %endif
 
 %if 0%{?with_python} > 0
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
 
 # Filter out private python and php libs. Does not work on EPEL5,
@@ -39,7 +39,7 @@
 %if 0%{?with_php} > 0
 %if 0%{?with_python} > 0
 %{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_provides_in %{python2_sitearch}/.*\.so$
 %filter_provides_in %{php_extdir}/.*\.so$
 %filter_setup
 }
@@ -52,7 +52,7 @@
 %else
 %if 0%{?with_python} > 0
 %{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_provides_in %{python2_sitearch}/.*\.so$
 %filter_setup
 }
 %endif
@@ -63,24 +63,25 @@
 %else
 Name:           libkolabxml
 %endif
-Version: 1.2
-Release: 0.20160909.git%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Kolab XML format collection parser library
 
 Group:          System Environment/Libraries
 License:        LGPLv3+
 URL:            http://www.kolab.org
 
-# From fa555615bd732cdc7fef56bf617e57d1bcf174fd
-Source0:        libkolabxml-1.2.tar.gz
+Source0:        libkolabxml-%{version}.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
 BuildRequires:  cmake >= 2.6
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+BuildRequires:  extra-cmake-modules
+%endif
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libcurl-devel
@@ -88,8 +89,12 @@
 %if 0%{?suse_version}
 BuildRequires:  qt-devel
 %else
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+BuildRequires:  qt5-qtbase-devel
+%else
 BuildRequires:  qt4-devel
 %endif
+%endif
 BuildRequires:  swig
 BuildRequires:  uuid-devel
 BuildRequires:  xsd
@@ -137,6 +142,9 @@
 Requires:       libkolabxml%{?_isa} = %{version}
 Requires:       boost-devel
 Requires:       cmake >= 2.6
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+Requires:       extra-cmake-modules
+%endif
 Requires:       e2fsprogs-devel
 Requires:       gcc-c++
 Requires:       libcurl-devel
@@ -144,13 +152,21 @@
 Requires:       php-devel >= 5.3
 %endif
 %if 0%{?with_python} > 0
+%if 0%{?rhel} >= 8
+Requires:       python2-devel
+%else
 Requires:       python-devel
 %endif
+%endif
 %if 0%{?suse_version}
 Requires:       qt-devel
 %else
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Requires:       qt5-qtbase-devel
+%else
 Requires:       qt4-devel
 %endif
+%endif
 Requires:       swig
 Requires:       uuid-devel
 %if 0%{?suse_version}
@@ -230,7 +246,11 @@
 Obsoletes:      python-%{name} < %{version}
 Provides:       python-%{name} = %{version}
 %endif
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+BuildRequires:  python2-devel
+%else
 BuildRequires:  python-devel
+%endif
 
 %description -n python-kolabformat
 The PyKolab format package offers a comprehensive Python library using the
@@ -240,8 +260,6 @@
 %prep
 %setup -q -n libkolabxml-%{version}
 
-%patch1001 -p1
-
 %if 0%{?with_at}
 %patch1002 -p1
 %endif
@@ -251,6 +269,8 @@
 %endif
 
 %build
+python utils/zonetabconversion.py
+
 rm -rf build
 mkdir -p build
 pushd build
@@ -286,6 +306,9 @@
     -DBOOST_INCLUDEDIR=%{_includedir}/boost141 \
     -DBoost_ADDITIONAL_VERSIONS="1.41;1.41.0" \
 %endif
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+    -DQT5_BUILD=ON \
+%endif
     -DINCLUDE_INSTALL_DIR=%{_includedir} \
 %if 0%{?with_csharp} > 0
     -DCSHARP_BINDINGS=ON \
@@ -301,8 +324,8 @@
 %endif
 %if 0%{?with_python} > 0
     -DPYTHON_BINDINGS=ON \
-    -DPYTHON_INCLUDE_DIRS=%{python_include} \
-    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
+    -DPYTHON_INCLUDE_DIRS=%{python2_include} \
+    -DPYTHON_INSTALL_DIR=%{python2_sitearch} \
 %endif
     ..
 make
@@ -388,11 +411,14 @@
 %if 0%{?with_python} > 0
 %files -n python-kolabformat
 %defattr(-,root,root,-)
-%{python_sitearch}/kolabformat.py*
-%{python_sitearch}/_kolabformat.so
+%{python2_sitearch}/kolabformat.py*
+%{python2_sitearch}/_kolabformat.so
 %endif
 
 %changelog
+* Tue May 14 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.2.0
+- Release of version 1.2.0
+
 * Thu May 28 2015 Christian Mollekopf <mollekopf@kolabsys.com> - 1.2
 - New upstream release
 - Removed dependency on kdepimlibs and kdelibs which is not required

fix-qverify-argument.patch Deleted

@@ -1,21 +0,0 @@
-diff -ur libkolabxml-1.2.orig/tests/kolabconversationtest.cpp libkolabxml-1.2/tests/kolabconversationtest.cpp
---- libkolabxml-1.2.orig/tests/kolabconversationtest.cpp	2016-09-09 12:42:25.000000000 +0200
-+++ libkolabxml-1.2/tests/kolabconversationtest.cpp	2017-05-07 22:11:51.688771350 +0200
-@@ -27,7 +27,7 @@
- void KolabConversationTest::configurationDeserialationTest()
- {
-     boost::shared_ptr <Kolab::Configuration> ptr = Kolab::KolabObjects::deserializeObject<Kolab::Configuration>(TEST_DATA_PATH "/testfiles/testConfiguration.xml", true);
--    QVERIFY(ptr);
-+    QVERIFY(ptr != 0);
-     QVERIFY(ptr->isValid());
-     QCOMPARE(ptr->type(), Kolab::Configuration::TypeRelation);
- 
-@@ -36,7 +36,7 @@
- void KolabConversationTest::noteDeserialationTest()
- {
-     boost::shared_ptr <Kolab::Note> ptr = Kolab::KolabObjects::deserializeObject<Kolab::Note>(TEST_DATA_PATH "/testfiles/testNote.xml", true);
--    QVERIFY(ptr);
-+    QVERIFY(ptr != 0);
-     QVERIFY(ptr->isValid());
-     QCOMPARE(ptr->summary(), std::string("summarytext"));
- }

debian.changelog Changed

debian.rules Changed

debian.series Changed

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

libkolabxml-1.2.tar.gz/tests/kolabconversationtest.cpp -> libkolabxml-1.2.0.tar.gz/tests/kolabconversationtest.cpp Changed

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

@@ -1,423 +1,598 @@
 //This file was generated by the zonetabconversion.py script
 static const char* olsonTimezones = {
-    "Europe/Andorra",
-    "Asia/Dubai",
-    "Asia/Kabul",
-    "America/Antigua",
-    "America/Anguilla",
-    "Europe/Tirane",
-    "Asia/Yerevan",
+    "Africa/Abidjan",
+    "Africa/Accra",
+    "Africa/Addis_Ababa",
+    "Africa/Algiers",
+    "Africa/Asmara",
+    "Africa/Asmera",
+    "Africa/Bamako",
+    "Africa/Bangui",
+    "Africa/Banjul",
+    "Africa/Bissau",
+    "Africa/Blantyre",
+    "Africa/Brazzaville",
+    "Africa/Bujumbura",
+    "Africa/Cairo",
+    "Africa/Casablanca",
+    "Africa/Ceuta",
+    "Africa/Conakry",
+    "Africa/Dakar",
+    "Africa/Dar_es_Salaam",
+    "Africa/Djibouti",
+    "Africa/Douala",
+    "Africa/El_Aaiun",
+    "Africa/Freetown",
+    "Africa/Gaborone",
+    "Africa/Harare",
+    "Africa/Johannesburg",
+    "Africa/Juba",
+    "Africa/Kampala",
+    "Africa/Khartoum",
+    "Africa/Kigali",
+    "Africa/Kinshasa",
+    "Africa/Lagos",
+    "Africa/Libreville",
+    "Africa/Lome",
     "Africa/Luanda",
-    "Antarctica/McMurdo",
-    "Antarctica/South_Pole",
-    "Antarctica/Rothera",
-    "Antarctica/Palmer",
-    "Antarctica/Mawson",
-    "Antarctica/Davis",
-    "Antarctica/Casey",
-    "Antarctica/Vostok",
-    "Antarctica/DumontDUrville",
-    "Antarctica/Syowa",
-    "America/Argentina/Buenos_Aires",
-    "America/Argentina/Cordoba",
-    "America/Argentina/Salta",
-    "America/Argentina/Jujuy",
-    "America/Argentina/Tucuman",
-    "America/Argentina/Catamarca",
-    "America/Argentina/La_Rioja",
-    "America/Argentina/San_Juan",
-    "America/Argentina/Mendoza",
-    "America/Argentina/San_Luis",
-    "America/Argentina/Rio_Gallegos",
-    "America/Argentina/Ushuaia",
-    "Pacific/Pago_Pago",
-    "Europe/Vienna",
-    "Australia/Lord_Howe",
-    "Antarctica/Macquarie",
-    "Australia/Hobart",
-    "Australia/Currie",
-    "Australia/Melbourne",
-    "Australia/Sydney",
-    "Australia/Broken_Hill",
-    "Australia/Brisbane",
-    "Australia/Lindeman",
-    "Australia/Adelaide",
-    "Australia/Darwin",
-    "Australia/Perth",
-    "Australia/Eucla",
-    "America/Aruba",
-    "Europe/Mariehamn",
-    "Asia/Baku",
-    "Europe/Sarajevo",
-    "America/Barbados",
-    "Asia/Dhaka",
-    "Europe/Brussels",
+    "Africa/Lubumbashi",
+    "Africa/Lusaka",
+    "Africa/Malabo",
+    "Africa/Maputo",
+    "Africa/Maseru",
+    "Africa/Mbabane",
+    "Africa/Mogadishu",
+    "Africa/Monrovia",
+    "Africa/Nairobi",
+    "Africa/Ndjamena",
+    "Africa/Niamey",
+    "Africa/Nouakchott",
     "Africa/Ouagadougou",
-    "Europe/Sofia",
-    "Asia/Bahrain",
-    "Africa/Bujumbura",
     "Africa/Porto-Novo",
-    "America/St_Barthelemy",
-    "Atlantic/Bermuda",
-    "Asia/Brunei",
-    "America/La_Paz",
-    "America/Kralendijk",
-    "America/Noronha",
-    "America/Belem",
-    "America/Fortaleza",
-    "America/Recife",
+    "Africa/Sao_Tome",
+    "Africa/Timbuktu",
+    "Africa/Tripoli",
+    "Africa/Tunis",
+    "Africa/Windhoek",
+    "America/Adak",
+    "America/Anchorage",
+    "America/Anguilla",
+    "America/Antigua",
     "America/Araguaina",
-    "America/Maceio",
+    "America/Aruba",
+    "America/Asuncion",
+    "America/Atikokan",
+    "America/Atka",
     "America/Bahia",
-    "America/Sao_Paulo",
+    "America/Bahia_Banderas",
+    "America/Barbados",
+    "America/Belem",
+    "America/Belize",
+    "America/Blanc-Sablon",
+    "America/Boa_Vista",
+    "America/Bogota",
+    "America/Boise",
+    "America/Buenos_Aires",
+    "America/Cambridge_Bay",
     "America/Campo_Grande",
+    "America/Cancun",
+    "America/Caracas",
+    "America/Catamarca",
+    "America/Cayenne",
+    "America/Cayman",
+    "America/Chicago",
+    "America/Chihuahua",
+    "America/Coral_Harbour",
+    "America/Cordoba",
+    "America/Costa_Rica",
+    "America/Creston",
     "America/Cuiaba",
-    "America/Santarem",
-    "America/Porto_Velho",
-    "America/Boa_Vista",
-    "America/Manaus",
+    "America/Curacao",
+    "America/Danmarkshavn",
+    "America/Dawson",
+    "America/Dawson_Creek",
+    "America/Denver",
+    "America/Detroit",
+    "America/Dominica",
+    "America/Edmonton",
     "America/Eirunepe",
-    "America/Rio_Branco",
-    "America/Nassau",
-    "Asia/Thimphu",
-    "Africa/Gaborone",
-    "Europe/Minsk",
-    "America/Belize",
-    "America/St_Johns",
-    "America/Halifax",
+    "America/El_Salvador",
+    "America/Ensenada",
+    "America/Fort_Nelson",
+    "America/Fort_Wayne",
+    "America/Fortaleza",
     "America/Glace_Bay",
-    "America/Moncton",
+    "America/Godthab",
     "America/Goose_Bay",
-    "America/Blanc-Sablon",
+    "America/Grand_Turk",
+    "America/Grenada",
+    "America/Guadeloupe",
+    "America/Guatemala",
+    "America/Guayaquil",
+    "America/Guyana",
+    "America/Halifax",
+    "America/Havana",
+    "America/Hermosillo",
+    "America/Indianapolis",
+    "America/Inuvik",
+    "America/Iqaluit",
+    "America/Jamaica",
+    "America/Jujuy",

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

@@ -1,29 +1,42 @@
 #!/bin/python2.7
 
+import os
+
+
+timezones = 
+
+for root, directories, filenames in os.walk('/usr/share/zoneinfo/'):
+    for filename in filenames:
+        if filename.endswith('.tab'):
+            continue
+
+        if filename.endswith('.zi'):
+            continue
+
+        if filename == 'leapseconds':
+            continue
+
+        if filename == 'posixrules':
+            continue
+
+        if os.path.basename(root) == "posix":
+            continue
+
+        if os.path.basename(root) == "right":
+            continue
+
+        timezones.append(os.path.join(os.path.basename(root), filename))
+
+
+timezones = sorted(list(set(timezones)))
+
 tztable = open("tztable.h", "w")
-tztable.write("//This file was generated by the zonetabconversion.py script\n");
-tztable.write("static const char* olsonTimezones = {\n");
-
-zonefile = open("/usr/share/zoneinfo/zone.tab", "r")
-first = True
-for line in zonefile:
-    # print line
-    if line.startswith('#'):
-        # print "continue"
-        continue
-    else:
-        tz = line.split(None)2
-        print tz
-        if first:
-            first = False
-            tztable.write("    \"")
-        else:
-            tztable.write(",\n    \"")
-        tztable.write(tz)
-        tztable.write("\"")
-        
-tztable.write("\n};\n")
-tztable.write("\n")
-tztable.write("static const int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones;\n")
+tztable.write("//This file was generated by the zonetabconversion.py script\n")
+tztable.write("static const char* olsonTimezones = {\n")
+
+tztable.write('    "')
+tztable.write('",\n    "'.join(timezones))
+tztable.write('"\n};\n')
+tztable.write('\n')
+tztable.write('static const long unsigned int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones;\n')
 tztable.write("\n")
-

libkolabxml.dsc Changed

Changes of Revision 8