From 1683f0acfd681ea44796381824e5c042111420fbdb33dbb8566c943fabe3d212 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 08:21:53 +0000 Subject: [PATCH 1/5] KDE Frameworks 5.33 - Automated change, please review OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=133 --- kfilemetadata-5.32.0.tar.xz | 3 --- kfilemetadata-5.33.0.tar.xz | 3 +++ kfilemetadata5.changes | 12 ++++++++++++ kfilemetadata5.spec | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 kfilemetadata-5.32.0.tar.xz create mode 100644 kfilemetadata-5.33.0.tar.xz diff --git a/kfilemetadata-5.32.0.tar.xz b/kfilemetadata-5.32.0.tar.xz deleted file mode 100644 index 91614bb..0000000 --- a/kfilemetadata-5.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e817ff8d63de773b4e320e4864936bb724cd80e04ad38c2035dd19eeb0ba905 -size 216268 diff --git a/kfilemetadata-5.33.0.tar.xz b/kfilemetadata-5.33.0.tar.xz new file mode 100644 index 0000000..c95aede --- /dev/null +++ b/kfilemetadata-5.33.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20cff74ff6acc1b58bb823bda39ce07aaea546d004423499a50fd13a110c7cad +size 216420 diff --git a/kfilemetadata5.changes b/kfilemetadata5.changes index 96d4cbb..95237bd 100644 --- a/kfilemetadata5.changes +++ b/kfilemetadata5.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Apr 15 10:11:48 CEST 2017 - lbeltrame@kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * Make PlainTextExtractor match "text/plain" again + * Upgrade KF5 version to 5.33.0. + ------------------------------------------------------------------- Mon Mar 20 14:52:29 UTC 2017 - wbauer@tmo.at diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index 91d135b..132ca20 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -20,7 +20,7 @@ %bcond_without lang %define _tar_path 5.32 Name: kfilemetadata5 -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} Summary: Extract Metadata From 52cf29403ed096522f562e63e9c1736e09ae3b7c8ed8164e4ffb3835c0d5bc27 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 09:50:29 +0000 Subject: [PATCH 2/5] Fix _tar_path version OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=134 --- kfilemetadata5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index 132ca20..02f7106 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -18,7 +18,7 @@ %bcond_without ffmpeg %bcond_without lang -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kfilemetadata5 Version: 5.33.0 Release: 0 From 498c7402e91e0a0aa22f15651a7df8f3c6fee7728e6172807b3ad8d10ff4845a Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 15 Apr 2017 15:52:02 +0000 Subject: [PATCH 3/5] - Remove patches, now upstream: * Make-PlainTextExtractor-match-text-plain-again.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=135 --- ...TextExtractor-match-text-plain-again.patch | 123 ------------------ kfilemetadata5.changes | 2 + kfilemetadata5.spec | 3 - 3 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 Make-PlainTextExtractor-match-text-plain-again.patch diff --git a/Make-PlainTextExtractor-match-text-plain-again.patch b/Make-PlainTextExtractor-match-text-plain-again.patch deleted file mode 100644 index 1713dd0..0000000 --- a/Make-PlainTextExtractor-match-text-plain-again.patch +++ /dev/null @@ -1,123 +0,0 @@ -From f9c8bb29b2cf5d46ff68c0261393084d1ff16ece Mon Sep 17 00:00:00 2001 -From: Igor Poboiko -Date: Fri, 17 Mar 2017 11:21:45 +0300 -Subject: Make PlainTextExtractor match "text/plain" again - -This fixes the regression introduced with commit -7c7e985a4678fef5f5d0dd8faa9b9cb42e3844b4. -Added autotest that could possibly detect such regression in the future. - -REVIEW: 130013 ---- - autotests/CMakeLists.txt | 14 +++++++++++ - autotests/extractorcollectiontest.cpp | 45 +++++++++++++++++++++++++++++++++++ - src/externalextractor.cpp | 2 -- - src/extractors/plaintextextractor.cpp | 2 +- - 4 files changed, 60 insertions(+), 3 deletions(-) - create mode 100644 autotests/extractorcollectiontest.cpp - -diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt -index 5ab742b..5d28bdf 100644 ---- a/autotests/CMakeLists.txt -+++ b/autotests/CMakeLists.txt -@@ -104,6 +104,20 @@ ecm_add_test(externalextractortest.cpp ../src/externalextractor.cpp - LINK_LIBRARIES Qt5::Test KF5::FileMetaData KF5::I18n - ) - -+# -+# Collection -+# -+set(extractorcollection_SRCS -+ extractorcollectiontest.cpp -+ ../src/extractorcollection.cpp -+ ../src/externalextractor.cpp -+) -+ -+ecm_add_test(${extractorcollection_SRCS} -+ TEST_NAME "extractorcollectiontest" -+ LINK_LIBRARIES Qt5::Test KF5::FileMetaData -+) -+ - ################ - # Writer tests # - ################ -diff --git a/autotests/extractorcollectiontest.cpp b/autotests/extractorcollectiontest.cpp -new file mode 100644 -index 0000000..dd5f396 ---- /dev/null -+++ b/autotests/extractorcollectiontest.cpp -@@ -0,0 +1,45 @@ -+/* -+ * This file is part of the KDE KFileMetaData project -+ * Copyright (C) 2014 Vishesh Handa -+ * 2017 Igor Poboiko -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#include -+#include -+#include -+ -+#include "extractorcollection.h" -+#include "extractors/plaintextextractor.h" -+ -+using namespace KFileMetaData; -+ -+class ExtractorCollectionTest : public QObject -+{ -+ Q_OBJECT -+private Q_SLOTS: -+ void testFetchExtractors() -+ { -+ ExtractorCollection collection; -+ QVERIFY(collection.fetchExtractors("unknown/mimetype").isEmpty()); -+ QVERIFY(!collection.fetchExtractors("text/plain").isEmpty()); -+ } -+}; -+ -+QTEST_MAIN(ExtractorCollectionTest) -+ -+#include "extractorcollectiontest.moc" -diff --git a/src/externalextractor.cpp b/src/externalextractor.cpp -index 05f0645..1927456 100644 ---- a/src/externalextractor.cpp -+++ b/src/externalextractor.cpp -@@ -30,8 +30,6 @@ - #include - #include - --#include -- - #include "properties.h" - #include "propertyinfo.h" - #include "typeinfo.h" -diff --git a/src/extractors/plaintextextractor.cpp b/src/extractors/plaintextextractor.cpp -index 26e1247..e53d149 100644 ---- a/src/extractors/plaintextextractor.cpp -+++ b/src/extractors/plaintextextractor.cpp -@@ -43,7 +43,7 @@ PlainTextExtractor::PlainTextExtractor(QObject* parent) - - QStringList PlainTextExtractor::mimetypes() const - { -- return QStringList() << QStringLiteral("text/"); -+ return QStringList() << QStringLiteral("text/plain"); - } - - void PlainTextExtractor::extract(ExtractionResult* result) --- -cgit v0.11.2 - diff --git a/kfilemetadata5.changes b/kfilemetadata5.changes index 95237bd..1775a64 100644 --- a/kfilemetadata5.changes +++ b/kfilemetadata5.changes @@ -9,6 +9,8 @@ Sat Apr 15 10:11:48 CEST 2017 - lbeltrame@kde.org * Upgrade ECM and KF5 version requirements for 5.33.0 release. * Make PlainTextExtractor match "text/plain" again * Upgrade KF5 version to 5.33.0. +- Remove patches, now upstream: + * Make-PlainTextExtractor-match-text-plain-again.patch ------------------------------------------------------------------- Mon Mar 20 14:52:29 UTC 2017 - wbauer@tmo.at diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index 02f7106..83ea5cb 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -30,8 +30,6 @@ Url: http://www.kde.org/ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz Source1: baselibs.conf Patch0: ffmpeg-buildrequires.patch -# PATCH-FIX-UPSTREAM Make-PlainTextExtractor-match-text-plain-again.patch -- fixes metadata extraction for text files -Patch1: Make-PlainTextExtractor-match-text-plain-again.patch BuildRequires: extra-cmake-modules >= %{_tar_path} %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) @@ -71,7 +69,6 @@ A library for extracting file metadata. Development files %prep %setup -q -n kfilemetadata-%{version} %patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} From a0b40db2bfacc50a67831b6432b49994c9618f210b2b01781a2ce31b1b58b15f Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:14:06 +0000 Subject: [PATCH 4/5] Put _kf5_bugfix_version to ease maintenance instead of relying on _tar_path (port from KUF) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=136 --- kfilemetadata5.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index 83ea5cb..49d05de 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -18,27 +18,30 @@ %bcond_without ffmpeg %bcond_without lang -%define _tar_path 5.33 Name: kfilemetadata5 Version: 5.33.0 Release: 0 +# Full KF5 version (e.g. 5.33.0) +%{!?_kf5_version: %global _kf5_version %{version}} +# Last major and minor KF5 version (e.g. 5.33) +%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %define kf5_version %{version} Summary: Extract Metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 Group: Development/Libraries/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/kfilemetadata-%{version}.tar.xz Source1: baselibs.conf Patch0: ffmpeg-buildrequires.patch -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) %endif -BuildRequires: karchive-devel >= %{_tar_path} +BuildRequires: karchive-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} BuildRequires: libattr-devel BuildRequires: libepub-devel BuildRequires: libexiv2-devel >= 0.21 @@ -59,7 +62,7 @@ A library for extracting file metadata. Summary: Development package for kfilemetadata Group: Development/Libraries/KDE Requires: %{name} = %{version} -Requires: extra-cmake-modules >= %{_tar_path} +Requires: extra-cmake-modules >= %{_kf5_bugfix_version} Requires: cmake(Qt5Core) >= 5.6.0 %description devel From 3d758241294758f58c10d7b4baff734f8772b3b8d054c541dec57b7463326927 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:25:01 +0000 Subject: [PATCH 5/5] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=137 --- kfilemetadata5.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index 49d05de..83ea5cb 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -18,30 +18,27 @@ %bcond_without ffmpeg %bcond_without lang +%define _tar_path 5.33 Name: kfilemetadata5 Version: 5.33.0 Release: 0 -# Full KF5 version (e.g. 5.33.0) -%{!?_kf5_version: %global _kf5_version %{version}} -# Last major and minor KF5 version (e.g. 5.33) -%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %define kf5_version %{version} Summary: Extract Metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 Group: Development/Libraries/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/kfilemetadata-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz Source1: baselibs.conf Patch0: ffmpeg-buildrequires.patch -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) %endif -BuildRequires: karchive-devel >= %{_kf5_bugfix_version} +BuildRequires: karchive-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: libattr-devel BuildRequires: libepub-devel BuildRequires: libexiv2-devel >= 0.21 @@ -62,7 +59,7 @@ A library for extracting file metadata. Summary: Development package for kfilemetadata Group: Development/Libraries/KDE Requires: %{name} = %{version} -Requires: extra-cmake-modules >= %{_kf5_bugfix_version} +Requires: extra-cmake-modules >= %{_tar_path} Requires: cmake(Qt5Core) >= 5.6.0 %description devel