From e84fb37ed033fa3f979de8bb2afe67619c0ef3b2b1805423b5d70bce81ba1f12 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 16 Jul 2014 14:18:47 +0000
Subject: [PATCH] Accepting request 240648 from KDE:Distro:Factory

Update to 4.13.80

OBS-URL: https://build.opensuse.org/request/show/240648
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/juk?expand=0&rev=30
---
 0001-fix-the-appdata-dir.patch | 21 +++++++++++++++++++++
 juk-4.13.2.tar.xz              |  3 ---
 juk-4.13.80.tar.xz             |  3 +++
 juk.changes                    |  8 ++++++++
 juk.spec                       | 16 +++++++++++-----
 5 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 0001-fix-the-appdata-dir.patch
 delete mode 100644 juk-4.13.2.tar.xz
 create mode 100644 juk-4.13.80.tar.xz

diff --git a/0001-fix-the-appdata-dir.patch b/0001-fix-the-appdata-dir.patch
new file mode 100644
index 0000000..f777ea0
--- /dev/null
+++ b/0001-fix-the-appdata-dir.patch
@@ -0,0 +1,21 @@
+commit 19309cea25a427b49059f9ca9a9d2b762f2a57ca
+Author: Christophe Giboudeaux <cgiboudeaux@gmx.com>
+Date:   Fri Jul 11 09:30:14 2014 +0200
+
+    Fix the appdata file location.
+    
+    CCMAIL: aacid@kde.org
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8d7649..d222e6c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,7 +155,7 @@ install(TARGETS juk  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ 
+ install( PROGRAMS juk.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+ install( FILES juk.notifyrc jukui.rc jukui-rtl.rc  DESTINATION  ${DATA_INSTALL_DIR}/juk )
+-install( FILES juk.appdata.xml DESTINATION ${DATA_INSTALL_DIR}/appdata )
++install( FILES juk.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
+ install( FILES jukservicemenu.desktop  DESTINATION
+ ${SERVICES_INSTALL_DIR}/ServiceMenus )
+ install( FILES org.kde.juk.collection.xml org.kde.juk.player.xml org.kde.juk.search.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
diff --git a/juk-4.13.2.tar.xz b/juk-4.13.2.tar.xz
deleted file mode 100644
index 6c8caa8..0000000
--- a/juk-4.13.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d771eb3a905eae8115cdb05c11105ac69a219da2f55ad8a113fc5a5470edcc5
-size 428612
diff --git a/juk-4.13.80.tar.xz b/juk-4.13.80.tar.xz
new file mode 100644
index 0000000..881a486
--- /dev/null
+++ b/juk-4.13.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:784c782b571a57b56b3b4c70a0de3c5666ce8d461f38b9d0a356ef671d074083
+size 437256
diff --git a/juk.changes b/juk.changes
index a935fea..90db2f4 100644
--- a/juk.changes
+++ b/juk.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 10 22:16:20 UTC 2014 - cgiboudeaux@gmx.com
+
+- Update to 4.13.80
+   * KDE 4.14 Beta 1 release
+   * See http://www.kde.org/announcements/announce-4.14-beta1.php
+- Add 0001-fix-the-appdata-dir.patch (Fix the appdata file location)
+
 -------------------------------------------------------------------
 Sun Jun  8 18:37:54 UTC 2014 - tittiatcoke@gmail.com
 
diff --git a/juk.spec b/juk.spec
index b112095..b9e1d65 100644
--- a/juk.spec
+++ b/juk.spec
@@ -25,9 +25,11 @@ Summary:        Jukebox
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Players
 Url:            http://www.kde.org
-Version:        4.13.2
+Version:        4.13.80
 Release:        0
 Source0:        %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 0001-fix-the-appdata-dir.patch -- fixes the appdata file location
+Patch0:         0001-fix-the-appdata-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
 
@@ -36,6 +38,7 @@ Jukebox and music manager for KDE
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
   %cmake_kde4 -d build
@@ -53,12 +56,15 @@ Jukebox and music manager for KDE
 
 %files
 %defattr(-,root,root)
-%{_kde4_bindir}/juk
-%{_kde4_applicationsdir}/juk.desktop
+%doc COPYING
+%dir %{_kde4_datadir}/appdata
 %{_datadir}/dbus-1/interfaces/org.kde.juk.*
-%{_kde4_iconsdir}/hicolor/*/apps/juk.*
+%{_kde4_applicationsdir}/juk.desktop
 %{_kde4_appsdir}/juk/
-%{_kde4_servicesdir}/ServiceMenus/jukservicemenu.desktop
+%{_kde4_bindir}/juk
+%{_kde4_datadir}/appdata/juk.appdata.xml
 %{_kde4_htmldir}/en/juk/
+%{_kde4_iconsdir}/hicolor/*/apps/juk.*
+%{_kde4_servicesdir}/ServiceMenus/jukservicemenu.desktop
 
 %changelog