From 645e1aa4aa67fada23f725aa0c9dd1f4cdfd63d3e7032d0b5674c7bb1bb5add0 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sat, 21 Nov 2020 12:58:33 +0000
Subject: [PATCH] 20.12 beta

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kpublictransport?expand=0&rev=3
---
 ...nary-journey-queries-on-big-endian-s.patch |  44 ++++++++++++++++++
 _service                                      |  13 ------
 ...t-0.0.1git.20201108T190551~02631b5.obscpio |   3 --
 _service:obs_scm:kpublictransport.obsinfo     |   5 --
 applications.keyring                          | Bin 0 -> 3491 bytes
 kpublictransport-20.11.80.tar.xz              |   3 ++
 kpublictransport-20.11.80.tar.xz.sig          |  16 +++++++
 kpublictransport.changes                      |   9 ++++
 kpublictransport.spec                         |  41 +++++++---------
 9 files changed, 88 insertions(+), 46 deletions(-)
 create mode 100644 0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
 delete mode 100644 _service
 delete mode 100644 _service:obs_scm:kpublictransport-0.0.1git.20201108T190551~02631b5.obscpio
 delete mode 100644 _service:obs_scm:kpublictransport.obsinfo
 create mode 100644 applications.keyring
 create mode 100644 kpublictransport-20.11.80.tar.xz
 create mode 100644 kpublictransport-20.11.80.tar.xz.sig

diff --git a/0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch b/0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
new file mode 100644
index 0000000..0e0a640
--- /dev/null
+++ b/0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
@@ -0,0 +1,44 @@
+From 96ac04eca3444e8bed51daf3297d3e7b92089b93 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sat, 14 Nov 2020 15:48:07 +0100
+Subject: [PATCH] Disable Hafas binary journey queries on big endian systems
+
+The current way or parsing those responses doesn't consider endianess at
+all yet.
+---
+ autotests/hafasqueryparsertest.cpp     | 3 +++
+ src/lib/backends/hafasquerybackend.cpp | 4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/autotests/hafasqueryparsertest.cpp b/autotests/hafasqueryparsertest.cpp
+index a0838f1..3ded71e 100644
+--- a/autotests/hafasqueryparsertest.cpp
++++ b/autotests/hafasqueryparsertest.cpp
+@@ -35,6 +35,9 @@ private Q_SLOTS:
+ 
+     void testParseJourneyError()
+     {
++#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++        QSKIP("not supported on big endian systems yet!", SkipAll);
++#endif
+         HafasQueryParser p;
+         const auto res = p.parseQueryJourneyResponse(readFile(SOURCE_DIR "/data/hafas/journey-binary-error.bin.gz"));
+         QVERIFY(res.empty());
+diff --git a/src/lib/backends/hafasquerybackend.cpp b/src/lib/backends/hafasquerybackend.cpp
+index ed68def..67fa65d 100644
+--- a/src/lib/backends/hafasquerybackend.cpp
++++ b/src/lib/backends/hafasquerybackend.cpp
+@@ -226,6 +226,10 @@ QString HafasQueryBackend::locationId(const Location &loc) const
+ 
+ bool HafasQueryBackend::queryJourney(const JourneyRequest &request, JourneyReply *reply, QNetworkAccessManager *nam) const
+ {
++#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#warning Hafas binary journey reponse parsing not implemented for big endian yet!
++    return false;
++#endif
+     if ((request.modes() & JourneySection::PublicTransport) == 0) {
+         return false;
+     }
+-- 
+2.29.2
+
diff --git a/_service b/_service
deleted file mode 100644
index 79ca817..0000000
--- a/_service
+++ /dev/null
@@ -1,13 +0,0 @@
-<services>
-  <service name="obs_scm">
-    <param name="url">https://invent.kde.org/libraries/kpublictransport.git</param>
-    <param name="scm">git</param>
-    <param name="versionformat">0.0.1git.%ci~%h</param>
-  </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="buildtime" name="set_version" />
-</services>
diff --git a/_service:obs_scm:kpublictransport-0.0.1git.20201108T190551~02631b5.obscpio b/_service:obs_scm:kpublictransport-0.0.1git.20201108T190551~02631b5.obscpio
deleted file mode 100644
index ec060bc..0000000
--- a/_service:obs_scm:kpublictransport-0.0.1git.20201108T190551~02631b5.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eec6f5f94754a8fb87d83b7c8979060d4d0a30b188b0dc3e9f2523368f442d93
-size 2881548
diff --git a/_service:obs_scm:kpublictransport.obsinfo b/_service:obs_scm:kpublictransport.obsinfo
deleted file mode 100644
index f69dc68..0000000
--- a/_service:obs_scm:kpublictransport.obsinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-name: kpublictransport
-version: 0.0.1git.20201108T190551~02631b5
-mtime: 1604858751
-commit: 02631b5699289c28f2984619e3e1a34cf061db9a
-
diff --git a/applications.keyring b/applications.keyring
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..48be415fb86f1ea3eaacc154493673fc1b0b31605881758000cc70a628447769
GIT binary patch
literal 3491
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

literal 0
HcmV?d00001

diff --git a/kpublictransport-20.11.80.tar.xz b/kpublictransport-20.11.80.tar.xz
new file mode 100644
index 0000000..90680bb
--- /dev/null
+++ b/kpublictransport-20.11.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae26923f2c7452b3d0ad8013e8278f876fe46f52d062e0c760b1d8ec2acd6c00
+size 344712
diff --git a/kpublictransport-20.11.80.tar.xz.sig b/kpublictransport-20.11.80.tar.xz.sig
new file mode 100644
index 0000000..77b030e
--- /dev/null
+++ b/kpublictransport-20.11.80.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uonoACgkQOmpNuDnq
+ptcEqw/8DUBd72s/CXLcHYgCfuT8+UgJFDeOKuJ2i7RipuQ5913UTW5faMVby25X
+Dlkf0i52nBz/wbTjtKEfmkZT3BYwjQczlofNCcA9HIKILNB/Hv9ZZXKpNF6GA6un
+0Mtud+kc0AounvGAq3QM5SZvxJDr2XxFAedp0CylvZ1BqBRL9ir0Ta31E3peMxui
+/VOHHzVRqwy7vNwu713zK97PVteRK3TJ062F1hRokIJp0AmRKqa1Y2ige6G9/ASd
+/4jY6jt7Zat/8m/mcloK+8HnZQ74Pm3Il76YNa7ISM38HEE5QYwIJ2CmeGVBqPK9
+DLeUWRqw++q/Q0hAG7+up0/injPsn5KcFMi4ZEmUMJPzTGUuuNRyXkwuvRj2wq63
+IF7rc+BnAqaFxxNxVUjanyoDA5KSaP6HuEz3YUqyzFsNWhWXTfz7XCe6TfW9AxpK
+JXNI9cgci5IyqxTLHVla5Had/02AsbEMD6pqR7YVd/tKgNHgwXhCWmWCh/ftl9Pb
+gHbwH2bP+nh5suFzX6yiroPByk+eJN6q6AJk1VgzxezKwCT/YZWhekIk5SBK8j4s
+rhJNA/brxmaUf2vHPM3X5u05LKx3PYkyWz85AQg62tc/Kf0PvMR0QK27v9ESF1CC
+3d35aB1fDpv93XPKswgUrB/1vq09fXUIg8wnHPPvoe854f9QNy4=
+=aUwU
+-----END PGP SIGNATURE-----
diff --git a/kpublictransport.changes b/kpublictransport.changes
index dc51ee1..ea8c699 100644
--- a/kpublictransport.changes
+++ b/kpublictransport.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Nov 14 12:24:00 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 20.11.80.
+  * New feature release
+- kpublictransport is now released using the KDE release service.
+- Add upstream patch:
+  * 0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
+
 -------------------------------------------------------------------
 Mon Jul 22 07:46:15 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/kpublictransport.spec b/kpublictransport.spec
index 95bffe5..372e198 100644
--- a/kpublictransport.spec
+++ b/kpublictransport.spec
@@ -16,29 +16,33 @@
 #
 
 
-%global sover   0
-%global fullsover 0.0.1
+%global sover   20
 %global lname   libKPublicTransport%{sover}
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
+%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kpublictransport
-Version:        0.0.1
+Version:        20.11.80
 Release:        0
 Summary:        QML imports for querying public transport data
 License:        LGPL-2.0-or-later
-Group:          System/GUI/KDE
 URL:            https://www.kde.org
-# Not there yet
-Source:         %{name}-%{version}.tar.xz
+Source0:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+%if %{with lang}
+Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
 BuildRequires:  bison
-BuildRequires:  cmake >= 3.5
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  kf5-filesystem
 BuildRequires:  pkgconfig
-BuildRequires:  cmake(Qt5Quick) >= 5.10.0
-BuildRequires:  cmake(Qt5Test) >= 5.10.0
-BuildRequires:  cmake(Qt5Widgets) >= 5.10.0
+BuildRequires:  cmake(Qt5Quick) >= 5.11.0
+BuildRequires:  cmake(Qt5Test) >= 5.11.0
+BuildRequires:  cmake(Qt5Widgets) >= 5.11.0
 BuildRequires:  pkgconfig(zlib)
 Requires:       %{lname} = %{version}
 
@@ -65,8 +69,6 @@ Requires:       cmake(Qt5Gui)
 A library for access realtime public transport data and for performing public
 ransport journey queries.Development files.
 
-%lang_package -n %{lname}
-
 %prep
 %autosetup -p1
 
@@ -76,23 +78,13 @@ ransport journey queries.Development files.
 
 %install
 %kf5_makeinstall -C build
-%if %{with lang}
-  # Fill once released
-  # %find_lang %{name} --with-man --all-name
-%endif
 
 %check
-export CTEST_OUTPUT_ON_FAILURE=1
-export QT_QPA_PLATFORM=offscreen
-%make_build -C build test
+%ctest
 
 %post -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig
 
-%if %{with lang}
-%files -n %{lname}-lang -f %{name}.lang
-%endif
-
 %files
 %license LICENSES/*
 %dir %{_kf5_qmldir}/org/
@@ -102,8 +94,7 @@ export QT_QPA_PLATFORM=offscreen
 %files -n %{lname}
 %license LICENSES/*
 %{_kf5_debugdir}/org_kde_kpublictransport.categories
-%{_kf5_libdir}/libKPublicTransport.so.%{fullsover}
-%{_kf5_libdir}/libKPublicTransport.so.%{sover}
+%{_kf5_libdir}/libKPublicTransport.so.*
 
 %files devel
 %license LICENSES/*