From c7b4e36667bae18a8e799bb93b0f01bf62f2f2b0c3e304552dc813e455d2232c Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Fri, 7 Feb 2020 08:20:44 +0000
Subject: [PATCH 1/2] Applications 19.12.2 (take 2)

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kitinerary?expand=0&rev=60
---
 kitinerary-19.12.1.tar.xz     |  3 ---
 kitinerary-19.12.1.tar.xz.sig | 11 -----------
 kitinerary-19.12.2.tar.xz     |  3 +++
 kitinerary-19.12.2.tar.xz.sig | 11 +++++++++++
 kitinerary.changes            | 13 +++++++++++++
 kitinerary.spec               |  2 +-
 6 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 kitinerary-19.12.1.tar.xz
 delete mode 100644 kitinerary-19.12.1.tar.xz.sig
 create mode 100644 kitinerary-19.12.2.tar.xz
 create mode 100644 kitinerary-19.12.2.tar.xz.sig

diff --git a/kitinerary-19.12.1.tar.xz b/kitinerary-19.12.1.tar.xz
deleted file mode 100644
index 9c617ba..0000000
--- a/kitinerary-19.12.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6497469e9966c9c21c2810a1f21c2633b89e54dafb74d5689aa24382e3824926
-size 1179336
diff --git a/kitinerary-19.12.1.tar.xz.sig b/kitinerary-19.12.1.tar.xz.sig
deleted file mode 100644
index 02298d3..0000000
--- a/kitinerary-19.12.1.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl4T8XQACgkQ29LOiT4t
-HIfpxQf+PBPLt1nXQhJesXorlGZw83hWyoceszWN1paEVnK7YBOTzBT+KDG6sLDu
-GxZ8WiWJ016nQxBTATApHS23esVNOGGNgyNekypE9Uh+HdeJ7Wfl3LiMBViAq2Im
-+zokl0LYKomziccnRGWfz9+6WuZvyomQt5IqBsuFcwG+HDj2eYQlDO1p4/Un7wMp
-TNcj5+4e8smcT4x4pbWAmlr9iAmNyaMybZHeu6gM8cgOK6XSwpFS+N+Efmc62X5L
-DBgD7QNZPF6yKgnmyuFpaALo6TeVElk+pVo1zLwdR54/J9POlDUK4oKwvoszjMvr
-vrIA1bnE5L2QVCMXG0KekjnPeyseug==
-=V/Ev
------END PGP SIGNATURE-----
diff --git a/kitinerary-19.12.2.tar.xz b/kitinerary-19.12.2.tar.xz
new file mode 100644
index 0000000..a37909a
--- /dev/null
+++ b/kitinerary-19.12.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecee10bb1e6f06cd76ae58703835db20869597a8653aaaf3cfa7de99aba29171
+size 1182776
diff --git a/kitinerary-19.12.2.tar.xz.sig b/kitinerary-19.12.2.tar.xz.sig
new file mode 100644
index 0000000..27bbb03
--- /dev/null
+++ b/kitinerary-19.12.2.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl45NDgACgkQ29LOiT4t
+HIdPEggAlrYIn9VtGDHku+/MALbN1rW4uBAL/KwrmRLB54H5bgEZG1faIS7NdZW6
+3gju9H0WafJi4wlOSQ6SQT/var8GHuHXefXfN8Xcj+cDpZt4SYLuY0kw7457uKub
+prFKGimiZqf1VfZBvXVJrzH3KHPaKuass25Rn4LxfWklT2dFEE/O8VegrfzuqZs3
+YNF6R8DAtg+fcKoyHknBgXInIE9pdBuTZfiMlNEtYLIZBV+pZgvNpqV6jy/Agg5Y
+0SNm4baN/M9ljuqqOf/DW7d1vvxiuMXSGKhqZ1cZYSpH71JmfCphnlgkpT3TqY/m
+Gt0QCrEcY3Gq9YM+TekL1wdVLOmqdw==
+=sP0u
+-----END PGP SIGNATURE-----
diff --git a/kitinerary.changes b/kitinerary.changes
index 9069057..2a7e616 100644
--- a/kitinerary.changes
+++ b/kitinerary.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Feb  5 06:29:15 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
+
+- Update to 19.12.2
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/releases/19.12.2
+- Changes since 19.12.1:
+  * Fix merging of flight reservations with different IATA BCBP data
+  * Deal with the German language variant of Trenitalia tickets
+  * Move extractor engine capabilities string to the library
+  * Add walking distance accuracy level for the location comparison
+
 -------------------------------------------------------------------
 Tue Jan  7 10:00:42 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kitinerary.spec b/kitinerary.spec
index 61daa39..985370c 100644
--- a/kitinerary.spec
+++ b/kitinerary.spec
@@ -18,7 +18,7 @@
 
 %bcond_without lang
 Name:           kitinerary
-Version:        19.12.1
+Version:        19.12.2
 Release:        0
 Summary:        Data model and extraction system for travel reservations
 License:        LGPL-2.1-or-later

From 90ebef02e98aa24c7945571774c52b931e6a7caefcffbc113a02b2125539c629 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Fri, 7 Feb 2020 08:44:08 +0000
Subject: [PATCH 2/2] use %cmake_build

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kitinerary?expand=0&rev=61
---
 kitinerary.changes | 5 +++++
 kitinerary.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kitinerary.changes b/kitinerary.changes
index 2a7e616..939e5b0 100644
--- a/kitinerary.changes
+++ b/kitinerary.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb  7 08:37:37 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Replace %make_jobs with %cmake_build.
+
 -------------------------------------------------------------------
 Wed Feb  5 06:29:15 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kitinerary.spec b/kitinerary.spec
index 985370c..6b2bcde 100644
--- a/kitinerary.spec
+++ b/kitinerary.spec
@@ -84,7 +84,7 @@ to build programs that use the kitinerary library.
 
 %build
   %cmake_kf5 -d build
-  %make_jobs
+  %cmake_build
 
 %install
   %kf5_makeinstall -C build