From cedb284c2ddf7821d8104988e34524679dc45d035e90a207c39140c845f5a927 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 10 Nov 2019 09:13:21 +0000 Subject: [PATCH] Accepting request 747085 from home:wolfi323:branches:KDE:Extra - Update to 3.2.2 OBS-URL: https://build.opensuse.org/request/show/747085 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/tellico?expand=0&rev=53 --- Fix-build-with-Qt-5_13.patch | 38 ------------------------------------ tellico-3.2.1.tar.xz | 3 --- tellico-3.2.2.tar.xz | 3 +++ tellico.changes | 14 +++++++++++++ tellico.spec | 9 ++++----- 5 files changed, 21 insertions(+), 46 deletions(-) delete mode 100644 Fix-build-with-Qt-5_13.patch delete mode 100644 tellico-3.2.1.tar.xz create mode 100644 tellico-3.2.2.tar.xz diff --git a/Fix-build-with-Qt-5_13.patch b/Fix-build-with-Qt-5_13.patch deleted file mode 100644 index 9e30d99..0000000 --- a/Fix-build-with-Qt-5_13.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 43851a0a655a3a961f289087bdea989aa32cc028 -Author: Luca Beltrame -Date: Sun Jul 21 09:21:16 2019 +0200 - - Fix build with Qt 5.13 - - (cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b) - -diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp -index 724370e2..e6502bb0 100644 ---- a/src/gui/datewidget.cpp -+++ b/src/gui/datewidget.cpp -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #include - #include -commit d3c56eca11cd059d4348ab6696822c23d85af61a -Author: Robby Stephenson -Date: Sun Jul 21 19:17:35 2019 -0400 - - Fix apparent build problem on Jenkins - -diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index d8348e80..8250c562 100644 ---- a/src/mainwindow.cpp -+++ b/src/mainwindow.cpp -@@ -108,6 +108,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/tellico-3.2.1.tar.xz b/tellico-3.2.1.tar.xz deleted file mode 100644 index 3b078bf..0000000 --- a/tellico-3.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38bc369a5341f2a1ba2bb1b4736da1b6eb4d326352d17e5d54e609f93c140bf8 -size 5604632 diff --git a/tellico-3.2.2.tar.xz b/tellico-3.2.2.tar.xz new file mode 100644 index 0000000..bcf8cda --- /dev/null +++ b/tellico-3.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec0595a421011596b39b51e0e88558da2716073f066862e9707571be9de77a9a +size 5589296 diff --git a/tellico.changes b/tellico.changes index 5ebf3ad..6380baa 100644 --- a/tellico.changes +++ b/tellico.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Nov 10 08:40:10 UTC 2019 - wbauer@tmo.at + +- Update to 3.2.2: + Features: + * Added importer for LibraryThing.com JSON collection files + (kde#411095). + Bug Fixes: + * Fixed bug with calculating relative file links (kde#410551). + * Fixed bug to revert to behavior of selecting newly added + entries (kde#413217). + * Fixed compilation on KF 5.61 and Qt 5.13. +- Drop Fix-build-with-Qt-5_13.patch, merged upstream + ------------------------------------------------------------------- Mon Aug 12 09:07:26 UTC 2019 - Christophe Giboudeaux diff --git a/tellico.spec b/tellico.spec index afa7857..5d73d2e 100644 --- a/tellico.spec +++ b/tellico.spec @@ -17,14 +17,13 @@ Name: tellico -Version: 3.2.1 +Version: 3.2.2 Release: 0 Summary: A Collection Manager License: GPL-2.0-or-later Group: Productivity/Office/Other -URL: http://tellico-project.org/ -Source0: http://tellico-project.org/files/%{name}-%{version}.tar.xz -Patch0: Fix-build-with-Qt-5_13.patch +URL: https://tellico-project.org/ +Source0: https://tellico-project.org/files/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: libcdio-devel @@ -80,7 +79,7 @@ stamps, trading cards, comic books, and wines. %lang_package %prep -%autosetup -p1 +%setup -q %build %cmake_kf5 "-DENABLE_WEBCAM=true" -d build