Request 2491 (accepted)

Overview

Request 2491 (accepted)

Check in version 1.2.0

Created by vanmeeuwen over 5 years ago
In state accepted

Submit libkolabxml

Submit package Kolab:Winterfell / libkolabxml to package Kolab:16 / libkolabxml

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",
+    "America/Juneau",
+    "America/Knox_IN",
+    "America/Kralendijk",
+    "America/La_Paz",
+    "America/Lima",
+    "America/Los_Angeles",
+    "America/Louisville",
+    "America/Lower_Princes",
+    "America/Maceio",
+    "America/Managua",
+    "America/Manaus",
+    "America/Marigot",
+    "America/Martinique",
+    "America/Matamoros",
+    "America/Mazatlan",
+    "America/Mendoza",
+    "America/Menominee",
+    "America/Merida",
+    "America/Metlakatla",
+    "America/Mexico_City",
+    "America/Miquelon",
+    "America/Moncton",
+    "America/Monterrey",
+    "America/Montevideo",
     "America/Montreal",
-    "America/Toronto",
+    "America/Montserrat",
+    "America/Nassau",
+    "America/New_York",
     "America/Nipigon",
-    "America/Thunder_Bay",
-    "America/Iqaluit",
+    "America/Nome",
+    "America/Noronha",
+    "America/Ojinaga",
+    "America/Panama",
     "America/Pangnirtung",
-    "America/Resolute",
-    "America/Atikokan",
-    "America/Rankin_Inlet",
-    "America/Winnipeg",
+    "America/Paramaribo",
+    "America/Phoenix",
+    "America/Port-au-Prince",
+    "America/Port_of_Spain",
+    "America/Porto_Acre",
+    "America/Porto_Velho",
+    "America/Puerto_Rico",
+    "America/Punta_Arenas",
     "America/Rainy_River",
+    "America/Rankin_Inlet",
+    "America/Recife",
     "America/Regina",
+    "America/Resolute",
+    "America/Rio_Branco",
+    "America/Rosario",
+    "America/Santa_Isabel",
+    "America/Santarem",
+    "America/Santiago",
+    "America/Santo_Domingo",
+    "America/Sao_Paulo",
+    "America/Scoresbysund",
+    "America/Shiprock",
+    "America/Sitka",
+    "America/St_Barthelemy",
+    "America/St_Johns",
+    "America/St_Kitts",
+    "America/St_Lucia",
+    "America/St_Thomas",
+    "America/St_Vincent",
     "America/Swift_Current",
-    "America/Edmonton",
-    "America/Cambridge_Bay",
-    "America/Yellowknife",
-    "America/Inuvik",
-    "America/Creston",
-    "America/Dawson_Creek",
+    "America/Tegucigalpa",
+    "America/Thule",
+    "America/Thunder_Bay",
+    "America/Tijuana",
+    "America/Toronto",
+    "America/Tortola",
     "America/Vancouver",
+    "America/Virgin",
     "America/Whitehorse",
-    "America/Dawson",
-    "Indian/Cocos",
-    "Africa/Kinshasa",
-    "Africa/Lubumbashi",
-    "Africa/Bangui",
-    "Africa/Brazzaville",
-    "Europe/Zurich",
-    "Africa/Abidjan",
-    "Pacific/Rarotonga",
-    "America/Santiago",
-    "Pacific/Easter",
-    "Africa/Douala",
-    "Asia/Shanghai",
-    "Asia/Harbin",
-    "Asia/Chongqing",
-    "Asia/Urumqi",
-    "Asia/Kashgar",
-    "America/Bogota",
-    "America/Costa_Rica",
-    "America/Havana",
-    "Atlantic/Cape_Verde",
-    "America/Curacao",
-    "Indian/Christmas",
-    "Asia/Nicosia",
-    "Europe/Prague",
-    "Europe/Berlin",
-    "Europe/Busingen",
-    "Africa/Djibouti",
-    "Europe/Copenhagen",
-    "America/Dominica",
-    "America/Santo_Domingo",
-    "Africa/Algiers",
-    "America/Guayaquil",
-    "Pacific/Galapagos",
-    "Europe/Tallinn",
-    "Africa/Cairo",
-    "Africa/El_Aaiun",
-    "Africa/Asmara",
-    "Europe/Madrid",
-    "Africa/Ceuta",
-    "Atlantic/Canary",
-    "Africa/Addis_Ababa",
-    "Europe/Helsinki",
-    "Pacific/Fiji",
-    "Atlantic/Stanley",
-    "Pacific/Chuuk",
-    "Pacific/Pohnpei",
-    "Pacific/Kosrae",
-    "Atlantic/Faroe",
-    "Europe/Paris",
-    "Africa/Libreville",
-    "Europe/London",
-    "America/Grenada",
-    "Asia/Tbilisi",
-    "America/Cayenne",
-    "Europe/Guernsey",
-    "Africa/Accra",
-    "Europe/Gibraltar",
-    "America/Godthab",
-    "America/Danmarkshavn",
-    "America/Scoresbysund",
-    "America/Thule",
-    "Africa/Banjul",
-    "Africa/Conakry",
-    "America/Guadeloupe",
-    "Africa/Malabo",
-    "Europe/Athens",
-    "Atlantic/South_Georgia",
-    "America/Guatemala",
-    "Pacific/Guam",
-    "Africa/Bissau",
-    "America/Guyana",
+    "America/Winnipeg",
+    "America/Yakutat",
+    "America/Yellowknife",
+    "Antarctica/Casey",
+    "Antarctica/Davis",
+    "Antarctica/DumontDUrville",
+    "Antarctica/Macquarie",
+    "Antarctica/Mawson",
+    "Antarctica/McMurdo",
+    "Antarctica/Palmer",
+    "Antarctica/Rothera",
+    "Antarctica/South_Pole",
+    "Antarctica/Syowa",
+    "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",
+    "Asia/Anadyr",
+    "Asia/Aqtau",
+    "Asia/Aqtobe",
+    "Asia/Ashgabat",
+    "Asia/Ashkhabad",
+    "Asia/Atyrau",
+    "Asia/Baghdad",
+    "Asia/Bahrain",
+    "Asia/Baku",
+    "Asia/Bangkok",
+    "Asia/Barnaul",
+    "Asia/Beirut",
+    "Asia/Bishkek",
+    "Asia/Brunei",
+    "Asia/Calcutta",
+    "Asia/Chita",
+    "Asia/Choibalsan",
+    "Asia/Chongqing",
+    "Asia/Chungking",
+    "Asia/Colombo",
+    "Asia/Dacca",
+    "Asia/Damascus",
+    "Asia/Dhaka",
+    "Asia/Dili",
+    "Asia/Dubai",
+    "Asia/Dushanbe",
+    "Asia/Famagusta",
+    "Asia/Gaza",
+    "Asia/Harbin",
+    "Asia/Hebron",
+    "Asia/Ho_Chi_Minh",
     "Asia/Hong_Kong",
-    "America/Tegucigalpa",
-    "Europe/Zagreb",
-    "America/Port-au-Prince",
-    "Europe/Budapest",
+    "Asia/Hovd",
+    "Asia/Irkutsk",
+    "Asia/Istanbul",
     "Asia/Jakarta",
-    "Asia/Pontianak",
-    "Asia/Makassar",
     "Asia/Jayapura",
-    "Europe/Dublin",
     "Asia/Jerusalem",
-    "Europe/Isle_of_Man",
+    "Asia/Kabul",
+    "Asia/Kamchatka",
+    "Asia/Karachi",
+    "Asia/Kashgar",
+    "Asia/Kathmandu",
+    "Asia/Katmandu",
+    "Asia/Khandyga",
     "Asia/Kolkata",
-    "Indian/Chagos",
-    "Asia/Baghdad",
-    "Asia/Tehran",
-    "Atlantic/Reykjavik",
-    "Europe/Rome",
-    "Europe/Jersey",
-    "America/Jamaica",
-    "Asia/Amman",
-    "Asia/Tokyo",
-    "Africa/Nairobi",
-    "Asia/Bishkek",
+    "Asia/Krasnoyarsk",
+    "Asia/Kuala_Lumpur",
+    "Asia/Kuching",
+    "Asia/Kuwait",
+    "Asia/Macao",
+    "Asia/Macau",
+    "Asia/Magadan",
+    "Asia/Makassar",
+    "Asia/Manila",
+    "Asia/Muscat",
+    "Asia/Nicosia",
+    "Asia/Novokuznetsk",
+    "Asia/Novosibirsk",
+    "Asia/Omsk",
+    "Asia/Oral",
     "Asia/Phnom_Penh",
-    "Pacific/Tarawa",
-    "Pacific/Enderbury",
-    "Pacific/Kiritimati",
-    "Indian/Comoro",
-    "America/St_Kitts",
+    "Asia/Pontianak",
     "Asia/Pyongyang",
-    "Asia/Seoul",
-    "Asia/Kuwait",
-    "America/Cayman",
-    "Asia/Almaty",
+    "Asia/Qatar",
+    "Asia/Qostanay",
     "Asia/Qyzylorda",
-    "Asia/Aqtobe",
-    "Asia/Aqtau",
-    "Asia/Oral",
-    "Asia/Vientiane",
-    "Asia/Beirut",
-    "America/St_Lucia",
-    "Europe/Vaduz",
-    "Asia/Colombo",
-    "Africa/Monrovia",
-    "Africa/Maseru",
-    "Europe/Vilnius",
-    "Europe/Luxembourg",
-    "Europe/Riga",
-    "Africa/Tripoli",
-    "Africa/Casablanca",
-    "Europe/Monaco",
-    "Europe/Chisinau",
-    "Europe/Podgorica",
-    "America/Marigot",
-    "Indian/Antananarivo",
-    "Pacific/Majuro",
-    "Pacific/Kwajalein",
-    "Europe/Skopje",
-    "Africa/Bamako",
     "Asia/Rangoon",
+    "Asia/Riyadh",
+    "Asia/Saigon",
+    "Asia/Sakhalin",
+    "Asia/Samarkand",
+    "Asia/Seoul",
+    "Asia/Shanghai",
+    "Asia/Singapore",
+    "Asia/Srednekolymsk",
+    "Asia/Taipei",
+    "Asia/Tashkent",
+    "Asia/Tbilisi",
+    "Asia/Tehran",
+    "Asia/Tel_Aviv",
+    "Asia/Thimbu",
+    "Asia/Thimphu",
+    "Asia/Tokyo",
+    "Asia/Tomsk",
+    "Asia/Ujung_Pandang",
     "Asia/Ulaanbaatar",
-    "Asia/Hovd",
-    "Asia/Choibalsan",
-    "Asia/Macau",
-    "Pacific/Saipan",
-    "America/Martinique",
-    "Africa/Nouakchott",
-    "America/Montserrat",
-    "Europe/Malta",
-    "Indian/Mauritius",
-    "Indian/Maldives",
-    "Africa/Blantyre",
-    "America/Mexico_City",
-    "America/Cancun",
-    "America/Merida",
-    "America/Monterrey",
-    "America/Matamoros",
-    "America/Mazatlan",
-    "America/Chihuahua",
-    "America/Ojinaga",
-    "America/Hermosillo",
-    "America/Tijuana",
-    "America/Santa_Isabel",
-    "America/Bahia_Banderas",
-    "Asia/Kuala_Lumpur",
-    "Asia/Kuching",
-    "Africa/Maputo",
-    "Africa/Windhoek",
-    "Pacific/Noumea",
-    "Africa/Niamey",
-    "Pacific/Norfolk",
-    "Africa/Lagos",
-    "America/Managua",
-    "Europe/Amsterdam",
-    "Europe/Oslo",
-    "Asia/Kathmandu",
-    "Pacific/Nauru",
-    "Pacific/Niue",
-    "Pacific/Auckland",
-    "Pacific/Chatham",
-    "Asia/Muscat",
-    "America/Panama",
-    "America/Lima",
-    "Pacific/Tahiti",
-    "Pacific/Marquesas",
-    "Pacific/Gambier",
-    "Pacific/Port_Moresby",
-    "Asia/Manila",
-    "Asia/Karachi",
-    "Europe/Warsaw",
-    "America/Miquelon",
-    "Pacific/Pitcairn",
-    "America/Puerto_Rico",
-    "Asia/Gaza",
-    "Asia/Hebron",
-    "Europe/Lisbon",
-    "Atlantic/Madeira",
+    "Asia/Ulan_Bator",
+    "Asia/Urumqi",
+    "Asia/Ust-Nera",
+    "Asia/Vientiane",
+    "Asia/Vladivostok",
+    "Asia/Yakutsk",
+    "Asia/Yangon",
+    "Asia/Yekaterinburg",
+    "Asia/Yerevan",
     "Atlantic/Azores",
-    "Pacific/Palau",
-    "America/Asuncion",
-    "Asia/Qatar",
-    "Indian/Reunion",
-    "Europe/Bucharest",
+    "Atlantic/Bermuda",
+    "Atlantic/Canary",
+    "Atlantic/Cape_Verde",
+    "Atlantic/Faeroe",
+    "Atlantic/Faroe",
+    "Atlantic/Jan_Mayen",
+    "Atlantic/Madeira",
+    "Atlantic/Reykjavik",
+    "Atlantic/South_Georgia",
+    "Atlantic/St_Helena",
+    "Atlantic/Stanley",
+    "Australia/ACT",
+    "Australia/Adelaide",
+    "Australia/Brisbane",
+    "Australia/Broken_Hill",
+    "Australia/Canberra",
+    "Australia/Currie",
+    "Australia/Darwin",
+    "Australia/Eucla",
+    "Australia/Hobart",
+    "Australia/LHI",
+    "Australia/Lindeman",
+    "Australia/Lord_Howe",
+    "Australia/Melbourne",
+    "Australia/NSW",
+    "Australia/North",
+    "Australia/Perth",
+    "Australia/Queensland",
+    "Australia/South",
+    "Australia/Sydney",
+    "Australia/Tasmania",
+    "Australia/Victoria",
+    "Australia/West",
+    "Australia/Yancowinna",
+    "Brazil/Acre",
+    "Brazil/DeNoronha",
+    "Brazil/East",
+    "Brazil/West",
+    "CET",
+    "CST6CDT",
+    "Canada/Atlantic",
+    "Canada/Central",
+    "Canada/Eastern",
+    "Canada/Mountain",
+    "Canada/Newfoundland",
+    "Canada/Pacific",
+    "Canada/Saskatchewan",
+    "Canada/Yukon",
+    "Chile/Continental",
+    "Chile/EasterIsland",
+    "Cuba",
+    "EET",
+    "EST",
+    "EST5EDT",
+    "Egypt",
+    "Eire",
+    "Etc/GMT",
+    "Etc/GMT+0",
+    "Etc/GMT+1",
+    "Etc/GMT+10",
+    "Etc/GMT+11",
+    "Etc/GMT+12",
+    "Etc/GMT+2",
+    "Etc/GMT+3",
+    "Etc/GMT+4",
+    "Etc/GMT+5",
+    "Etc/GMT+6",
+    "Etc/GMT+7",
+    "Etc/GMT+8",
+    "Etc/GMT+9",
+    "Etc/GMT-0",
+    "Etc/GMT-1",
+    "Etc/GMT-10",
+    "Etc/GMT-11",
+    "Etc/GMT-12",
+    "Etc/GMT-13",
+    "Etc/GMT-14",
+    "Etc/GMT-2",
+    "Etc/GMT-3",
+    "Etc/GMT-4",
+    "Etc/GMT-5",
+    "Etc/GMT-6",
+    "Etc/GMT-7",
+    "Etc/GMT-8",
+    "Etc/GMT-9",
+    "Etc/GMT0",
+    "Etc/Greenwich",
+    "Etc/UCT",
+    "Etc/UTC",
+    "Etc/Universal",
+    "Etc/Zulu",
+    "Europe/Amsterdam",
+    "Europe/Andorra",
+    "Europe/Astrakhan",
+    "Europe/Athens",
+    "Europe/Belfast",
     "Europe/Belgrade",
+    "Europe/Berlin",
+    "Europe/Bratislava",
+    "Europe/Brussels",
+    "Europe/Bucharest",
+    "Europe/Budapest",
+    "Europe/Busingen",
+    "Europe/Chisinau",
+    "Europe/Copenhagen",
+    "Europe/Dublin",
+    "Europe/Gibraltar",
+    "Europe/Guernsey",
+    "Europe/Helsinki",
+    "Europe/Isle_of_Man",
+    "Europe/Istanbul",
+    "Europe/Jersey",
     "Europe/Kaliningrad",
+    "Europe/Kiev",
+    "Europe/Kirov",
+    "Europe/Lisbon",
+    "Europe/Ljubljana",
+    "Europe/London",
+    "Europe/Luxembourg",
+    "Europe/Madrid",
+    "Europe/Malta",
+    "Europe/Mariehamn",
+    "Europe/Minsk",
+    "Europe/Monaco",
     "Europe/Moscow",
-    "Europe/Volgograd",
+    "Europe/Nicosia",
+    "Europe/Oslo",
+    "Europe/Paris",
+    "Europe/Podgorica",
+    "Europe/Prague",
+    "Europe/Riga",
+    "Europe/Rome",
     "Europe/Samara",
-    "Asia/Yekaterinburg",
-    "Asia/Omsk",
-    "Asia/Novosibirsk",
-    "Asia/Novokuznetsk",
-    "Asia/Krasnoyarsk",
-    "Asia/Irkutsk",
-    "Asia/Yakutsk",
-    "Asia/Khandyga",
-    "Asia/Vladivostok",
-    "Asia/Sakhalin",
-    "Asia/Ust-Nera",
-    "Asia/Magadan",
-    "Asia/Kamchatka",
-    "Asia/Anadyr",
-    "Africa/Kigali",
-    "Asia/Riyadh",
-    "Pacific/Guadalcanal",
-    "Indian/Mahe",
-    "Africa/Khartoum",
-    "Europe/Stockholm",
-    "Asia/Singapore",
-    "Atlantic/St_Helena",
-    "Europe/Ljubljana",
-    "Arctic/Longyearbyen",
-    "Europe/Bratislava",
-    "Africa/Freetown",
     "Europe/San_Marino",
-    "Africa/Dakar",
-    "Africa/Mogadishu",
-    "America/Paramaribo",
-    "Africa/Juba",
-    "Africa/Sao_Tome",
-    "America/El_Salvador",
-    "America/Lower_Princes",
-    "Asia/Damascus",
-    "Africa/Mbabane",
-    "America/Grand_Turk",
-    "Africa/Ndjamena",
+    "Europe/Sarajevo",
+    "Europe/Saratov",
+    "Europe/Simferopol",
+    "Europe/Skopje",
+    "Europe/Sofia",
+    "Europe/Stockholm",
+    "Europe/Tallinn",
+    "Europe/Tirane",
+    "Europe/Tiraspol",
+    "Europe/Ulyanovsk",
+    "Europe/Uzhgorod",
+    "Europe/Vaduz",
+    "Europe/Vatican",
+    "Europe/Vienna",
+    "Europe/Vilnius",
+    "Europe/Volgograd",
+    "Europe/Warsaw",
+    "Europe/Zagreb",
+    "Europe/Zaporozhye",
+    "Europe/Zurich",
+    "GB",
+    "GB-Eire",
+    "GMT",
+    "GMT+0",
+    "GMT-0",
+    "GMT0",
+    "Greenwich",
+    "HST",
+    "Hongkong",
+    "Iceland",
+    "Indian/Antananarivo",
+    "Indian/Chagos",
+    "Indian/Christmas",
+    "Indian/Cocos",
+    "Indian/Comoro",
     "Indian/Kerguelen",
-    "Africa/Lome",
-    "Asia/Bangkok",
-    "Asia/Dushanbe",
+    "Indian/Mahe",
+    "Indian/Maldives",
+    "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",
+    "MST",
+    "MST7MDT",
+    "Mexico/BajaNorte",
+    "Mexico/BajaSur",
+    "Mexico/General",
+    "NZ",
+    "NZ-CHAT",
+    "Navajo",
+    "North_Dakota/Beulah",
+    "North_Dakota/Center",
+    "North_Dakota/New_Salem",
+    "PRC",
+    "PST8PDT",
+    "Pacific/Apia",
+    "Pacific/Auckland",
+    "Pacific/Bougainville",
+    "Pacific/Chatham",
+    "Pacific/Chuuk",
+    "Pacific/Easter",
+    "Pacific/Efate",
+    "Pacific/Enderbury",
     "Pacific/Fakaofo",
-    "Asia/Dili",
-    "Asia/Ashgabat",
-    "Africa/Tunis",
-    "Pacific/Tongatapu",
-    "Europe/Istanbul",
-    "America/Port_of_Spain",
+    "Pacific/Fiji",
     "Pacific/Funafuti",
-    "Asia/Taipei",
-    "Africa/Dar_es_Salaam",
-    "Europe/Kiev",
-    "Europe/Uzhgorod",
-    "Europe/Zaporozhye",
-    "Europe/Simferopol",
-    "Africa/Kampala",
+    "Pacific/Galapagos",
+    "Pacific/Gambier",
+    "Pacific/Guadalcanal",
+    "Pacific/Guam",
+    "Pacific/Honolulu",
     "Pacific/Johnston",
+    "Pacific/Kiritimati",
+    "Pacific/Kosrae",
+    "Pacific/Kwajalein",
+    "Pacific/Majuro",
+    "Pacific/Marquesas",
     "Pacific/Midway",
+    "Pacific/Nauru",
+    "Pacific/Niue",
+    "Pacific/Norfolk",
+    "Pacific/Noumea",
+    "Pacific/Pago_Pago",
+    "Pacific/Palau",
+    "Pacific/Pitcairn",
+    "Pacific/Pohnpei",
+    "Pacific/Ponape",
+    "Pacific/Port_Moresby",
+    "Pacific/Rarotonga",
+    "Pacific/Saipan",
+    "Pacific/Samoa",
+    "Pacific/Tahiti",
+    "Pacific/Tarawa",
+    "Pacific/Tongatapu",
+    "Pacific/Truk",
     "Pacific/Wake",
-    "America/New_York",
-    "America/Detroit",
-    "America/Kentucky/Louisville",
-    "America/Kentucky/Monticello",
-    "America/Indiana/Indianapolis",
-    "America/Indiana/Vincennes",
-    "America/Indiana/Winamac",
-    "America/Indiana/Marengo",
-    "America/Indiana/Petersburg",
-    "America/Indiana/Vevay",
-    "America/Chicago",
-    "America/Indiana/Tell_City",
-    "America/Indiana/Knox",
-    "America/Menominee",
-    "America/North_Dakota/Center",
-    "America/North_Dakota/New_Salem",
-    "America/North_Dakota/Beulah",
-    "America/Denver",
-    "America/Boise",
-    "America/Shiprock",
-    "America/Phoenix",
-    "America/Los_Angeles",
-    "America/Anchorage",
-    "America/Juneau",
-    "America/Sitka",
-    "America/Yakutat",
-    "America/Nome",
-    "America/Adak",
-    "America/Metlakatla",
-    "Pacific/Honolulu",
-    "America/Montevideo",
-    "Asia/Samarkand",
-    "Asia/Tashkent",
-    "Europe/Vatican",
-    "America/St_Vincent",
-    "America/Caracas",
-    "America/Tortola",
-    "America/St_Thomas",
-    "Asia/Ho_Chi_Minh",
-    "Pacific/Efate",
     "Pacific/Wallis",
-    "Pacific/Apia",
-    "Asia/Aden",
-    "Indian/Mayotte",
-    "Africa/Johannesburg",
-    "Africa/Lusaka",
-    "Africa/Harare"
+    "Pacific/Yap",
+    "Poland",
+    "Portugal",
+    "ROC",
+    "ROK",
+    "Singapore",
+    "Turkey",
+    "UCT",
+    "US/Alaska",
+    "US/Aleutian",
+    "US/Arizona",
+    "US/Central",
+    "US/East-Indiana",
+    "US/Eastern",
+    "US/Hawaii",
+    "US/Indiana-Starke",
+    "US/Michigan",
+    "US/Mountain",
+    "US/Pacific",
+    "US/Pacific-New",
+    "US/Samoa",
+    "UTC",
+    "Universal",
+    "W-SU",
+    "WET",
+    "Zulu"
 };
 
 static const long unsigned int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones;

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

Build Results
RPM Lint

Refresh

Comments for request 2491 0

Request History

vanmeeuwen created request over 5 years ago

Check in version 1.2.0

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago