From 05bf3ca746cd28e84f710b5b4e1f3e50e19fd885333a8c5b0e98deb24f31c485 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 25 Aug 2014 08:59:47 +0000 Subject: [PATCH] Accepting request 245374 from KDE:Distro:Factory Update KDE to KDE 4.14.0 Final OBS-URL: https://build.opensuse.org/request/show/245374 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/juk?expand=0&rev=31 --- 0001-fix-the-appdata-dir.patch | 21 --------------------- juk-4.13.80.tar.xz | 3 --- juk-4.14.0.tar.xz | 3 +++ juk.changes | 15 +++++++++++++++ juk.spec | 5 +---- 5 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 0001-fix-the-appdata-dir.patch delete mode 100644 juk-4.13.80.tar.xz create mode 100644 juk-4.14.0.tar.xz diff --git a/0001-fix-the-appdata-dir.patch b/0001-fix-the-appdata-dir.patch deleted file mode 100644 index f777ea0..0000000 --- a/0001-fix-the-appdata-dir.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 19309cea25a427b49059f9ca9a9d2b762f2a57ca -Author: Christophe Giboudeaux -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.80.tar.xz b/juk-4.13.80.tar.xz deleted file mode 100644 index 881a486..0000000 --- a/juk-4.13.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:784c782b571a57b56b3b4c70a0de3c5666ce8d461f38b9d0a356ef671d074083 -size 437256 diff --git a/juk-4.14.0.tar.xz b/juk-4.14.0.tar.xz new file mode 100644 index 0000000..8c4cfc4 --- /dev/null +++ b/juk-4.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43f2f8641cb6a526bff466646cc3f81fe49399bc92cdb56d86c5e52566b1125c +size 437452 diff --git a/juk.changes b/juk.changes index 90db2f4..c188f34 100644 --- a/juk.changes +++ b/juk.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Aug 15 08:36:54 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.14.0 + * KDE 4.14.0 SC Final Release + * See http://www.kde.org/announcements/4.13/ + +------------------------------------------------------------------- +Thu Jul 17 16:43:53 UTC 2014 - cgiboudeaux@gmx.com + +- Update to 4.13.90 + * KDE 4.14 Beta 2 release + * See http://www.kde.org/announcements/announce-4.14-beta2.php +- Drop 0001-fix-the-appdata-dir.patch (merged upstream) + ------------------------------------------------------------------- Thu Jul 10 22:16:20 UTC 2014 - cgiboudeaux@gmx.com diff --git a/juk.spec b/juk.spec index b9e1d65..8a03181 100644 --- a/juk.spec +++ b/juk.spec @@ -25,11 +25,9 @@ Summary: Jukebox License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.kde.org -Version: 4.13.80 +Version: 4.14.0 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 @@ -38,7 +36,6 @@ Jukebox and music manager for KDE %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build %cmake_kde4 -d build