Accepting request 443283 from home:luca_b:test_KA

KDE Applications - please review

OBS-URL: https://build.opensuse.org/request/show/443283
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/gwenview5?expand=0&rev=47

fix-multiple-arguments.diff

@@ -1,35 +0,0 @@
-Index: gwenview-16.08.1/app/main.cpp
-===================================================================
---- gwenview-16.08.1.orig/app/main.cpp
-+++ gwenview-16.08.1/app/main.cpp
-@@ -59,8 +59,19 @@ public:
-             mMultipleUrlsDir.reset(new QTemporaryDir);
-             mUrl = QUrl::fromLocalFile(mMultipleUrlsDir->path());
-             QList<QUrl> list;
--            foreach(const QString & url, args) {
--                list << QUrl::fromUserInput(url);
-+            QStringList tmpArgs = args;
-+            tmpArgs.removeDuplicates();
-+            foreach(const QString & url, tmpArgs) {
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
-+                list << QUrl::fromUserInput(url, QDir::currentPath(), QUrl::AssumeLocalFile);
-+#else
-+                QUrl tmpUrl = QUrl(url);
-+                if (tmpUrl.scheme().isEmpty() && !url.startsWith(QLatin1Char('/'))) {
-+                   list << QUrl::fromLocalFile(url);
-+                } else {
-+                   list << QUrl::fromUserInput(url);
-+                }
-+#endif
-             }
- 
-             KIO::CopyJob* job = KIO::link(list, mUrl);
-@@ -68,7 +79,7 @@ public:
-         } else {
-             QString tmpArg = args.first();
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
--            mUrl = QUrl::fromUserInput(tmpArg, QDir::currentPath());
-+            mUrl = QUrl::fromUserInput(tmpArg, QDir::currentPath(), QUrl::AssumeLocalFile);
- #else
-             QUrl tmpUrl = QUrl(tmpArg);
-             if (tmpUrl.scheme().isEmpty() && !tmpArg.startsWith(QLatin1Char('/'))) {

gwenview-16.08.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a31fa161d657ad89e659360956660bfc679e3e97e0f3d38664d5380e59695688
-size 2851592

gwenview-16.11.80.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be24a7d3a1f1eff2cc4137685900fdd85e67d2716fdf6b99e77ef4be25a93bbc
+size 2850436

gwenview5.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov 29 12:19:23 UTC 2016 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 16.11.80
+   * KDE Applications 16.12.0 Beta
+   * https://www.kde.org/announcements/announce-applications-16.12-beta.php
+
+- Dropped patches:
+   + fix-multiple-arguments.diff
+
 -------------------------------------------------------------------
 Wed Nov  9 06:10:04 UTC 2016 - lbeltrame@kde.org
 

gwenview5.spec

@@ -16,20 +16,21 @@
 #
 
 
-%define rname gwenview
 Name:           gwenview5
-Version:        16.08.3
+Version:        16.11.80
 Release:        0
+%define kf5_version 5.26.0
+# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 Summary:        Simple Image Viewer for KDE
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Viewers
 Url:            http://www.kde.org
-Source0:        %{rname}-%{version}.tar.xz
+Source:         gwenview-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM fix-multiple-arguments.diff boo#1001276 alarrosa@suse.com - Fix handling of multiple local file arguments in command line
-Patch0:         fix-multiple-arguments.diff
 BuildRequires:  baloo5-devel
-BuildRequires:  extra-cmake-modules >= 1.7.0
+BuildRequires:  extra-cmake-modules >= %{kf5_version}
 BuildRequires:  kactivities5-devel
+BuildRequires:  kconfig-devel
 BuildRequires:  kdelibs4support-devel
 BuildRequires:  kf5-filesystem
 BuildRequires:  kio-devel >= 5.4.0
@@ -40,20 +41,19 @@ BuildRequires:  libkipi-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  phonon4qt5-devel
+BuildRequires:  pkgconfig
+BuildRequires:  systemd-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Script) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Svg) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Test) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5X11Extras) >= 5.2.0
-Requires:       kdelibs4support
-%if 0%{?suse_version} > 1320
-Obsoletes:      gwenview < %{version}
-%else
 Conflicts:      gwenview
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -62,8 +62,7 @@ window and a file list window, providing easy navigation of your file
 hierarchy.
 
 %prep
-%setup -q -n %{rname}-%{version}
+%setup -q -n gwenview-%{version}
-%patch0 -p1
 
 %build
   %cmake_kf5 -d build -- -DGWENVIEW_SEMANTICINFO_BACKEND="Baloo"
@@ -71,24 +70,27 @@ hierarchy.
 
 %install
   %kf5_makeinstall -C build
+
   %suse_update_desktop_file -r org.kde.gwenview       Graphics RasterGraphics Viewer KDE
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc COPYING*
-%doc %lang(en) %{_kf5_htmldir}/en/*/
-%{_kf5_applicationsdir}/org.kde.gwenview.desktop
-%{_kf5_bindir}/gwenview
-%{_kf5_iconsdir}/hicolor/*/*/*
 %{_kf5_libdir}/libgwenviewlib.so.*
-%{_kf5_plugindir}/
+%{_kf5_bindir}/gwenview
-%{_kf5_servicesdir}/
-%{_kf5_appstreamdir}/
 %{_kf5_sharedir}/gwenview/
 %{_kf5_sharedir}/kxmlgui5/
+%{_kf5_appstreamdir}/
+%{_kf5_plugindir}/
+%{_kf5_applicationsdir}/org.kde.gwenview.desktop
+%{_kf5_servicesdir}/
+%{_kf5_iconsdir}/hicolor/*/*/*
+%dir %{_kf5_htmldir}/en
+%dir %{_kf5_htmldir}
+%doc %{_kf5_htmldir}/en/*/
+
 
 %changelog