diff --git a/.gitignore b/.gitignore index 5f690b6..9150760 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clementine-1.1.1.tar.gz /clementine-1.2.1.tar.gz /clementine-1.2.3.tar.gz +/clementine-1.3.0rc1.tar.xz diff --git a/clementine-desktop.patch b/clementine-desktop.patch deleted file mode 100644 index e318c42..0000000 --- a/clementine-desktop.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up clementine-1.2.1/dist/clementine.desktop.dt_categories clementine-1.2.1/dist/clementine.desktop ---- clementine-1.2.1/dist/clementine.desktop.dt_categories 2013-08-04 03:01:38.000000000 -0500 -+++ clementine-1.2.1/dist/clementine.desktop 2014-01-03 11:16:54.012334646 -0600 -@@ -12,12 +12,12 @@ Exec=clementine %U - TryExec=clementine - Icon=application-x-clementine - Terminal=false --Categories=AudioVideo;Player;Qt; -+Categories=AudioVideo;Audio;Player;Qt; - StartupNotify=false - MimeType=application/ogg;application/x-ogg;application/x-ogm-audio;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;video/x-ms-asf;x-content/audio-player;x-scheme-handler/zune;x-scheme-handler/itpc;x-scheme-handler/itms;x-scheme-handler/feed; - X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Previous;Next; - --[Play Shortcut Group] -+[X-Play Shortcut Group] - Name=Play - Exec=clementine --play - TargetEnvironment=Unity -@@ -66,7 +66,7 @@ Name[vi]=Phát - Name[zh_CN]=播放 - Name[zh_TW]=播放 - --[Pause Shortcut Group] -+[X-Pause Shortcut Group] - Name=Pause - Exec=clementine --pause - TargetEnvironment=Unity -@@ -110,7 +110,7 @@ Name[vi]=Tạm dừng - Name[zh_CN]=暂停 - Name[zh_TW]=暫停 - --[Stop Shortcut Group] -+[X-Stop Shortcut Group] - Name=Stop - Exec=clementine --stop - TargetEnvironment=Unity -@@ -157,7 +157,7 @@ Name[vi]=Dừng - Name[zh_CN]=停止 - Name[zh_TW]=停止 - --[Previous Shortcut Group] -+[X-Previous Shortcut Group] - Name=Previous - Exec=clementine --previous - TargetEnvironment=Unity -@@ -203,7 +203,7 @@ Name[vi]=Trước - Name[zh_CN]=上一首 - Name[zh_TW]=往前 - --[Next Shortcut Group] -+[X-Next Shortcut Group] - Name=Next - Exec=clementine --next - TargetEnvironment=Unity diff --git a/clementine-do-not-use-system-sha2.patch b/clementine-do-not-use-system-sha2.patch deleted file mode 100644 index 110f864..0000000 --- a/clementine-do-not-use-system-sha2.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 38c4cc1..850ad22 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -379,14 +379,10 @@ if(GMOCK_INCLUDE_DIRS) - endif(GTEST_INCLUDE_DIRS) - endif(GMOCK_INCLUDE_DIRS) - --# Use system sha2 if it's available --find_path(SHA2_INCLUDE_DIRS sha2.h) --find_library(SHA2_LIBRARIES sha2) --if(NOT SHA2_INCLUDE_DIRS OR NOT SHA2_LIBRARIES) -- add_subdirectory(3rdparty/sha2) -- set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2) -- set(SHA2_LIBRARIES sha2) --endif(NOT SHA2_INCLUDE_DIRS OR NOT SHA2_LIBRARIES) -+# Never use the system's sha2. -+add_subdirectory(3rdparty/sha2) -+set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2) -+set(SHA2_LIBRARIES sha2) - - # Use our 3rdparty chromaprint if a system one wasn't found - if(NOT CHROMAPRINT_FOUND) diff --git a/clementine-moodbar_flags.patch b/clementine-moodbar_flags.patch index 430c5d0..5eadfec 100644 --- a/clementine-moodbar_flags.patch +++ b/clementine-moodbar_flags.patch @@ -1,13 +1,14 @@ -diff -up clementine-1.2.3/gst/moodbar/CMakeLists.txt.moodbar_flags clementine-1.2.3/gst/moodbar/CMakeLists.txt ---- clementine-1.2.3/gst/moodbar/CMakeLists.txt.moodbar_flags 2014-09-22 04:44:59.000000000 -0500 -+++ clementine-1.2.3/gst/moodbar/CMakeLists.txt 2015-05-04 14:02:29.008369066 -0500 +diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt +index 44c1362..7ed5047 100644 +--- a/gst/moodbar/CMakeLists.txt ++++ b/gst/moodbar/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) -set(CMAKE_C_FLAGS "-Wall") --set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall") +-set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall --std=c++0x") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x") include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/clementine-mygpo.patch b/clementine-mygpo.patch deleted file mode 100644 index cb99156..0000000 --- a/clementine-mygpo.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up clementine-1.2.1/src/podcasts/gpoddersearchpage.h.mygpo-qt clementine-1.2.1/src/podcasts/gpoddersearchpage.h ---- clementine-1.2.1/src/podcasts/gpoddersearchpage.h.mygpo-qt 2012-07-17 12:27:37.000000000 -0500 -+++ clementine-1.2.1/src/podcasts/gpoddersearchpage.h 2014-01-03 10:40:37.672459609 -0600 -@@ -20,7 +20,7 @@ - - #include "addpodcastpage.h" - --#include -+#include - - class QNetworkAccessManager; - -diff -up clementine-1.2.1/src/podcasts/gpoddersync.cpp.mygpo-qt clementine-1.2.1/src/podcasts/gpoddersync.cpp -diff -up clementine-1.2.1/src/podcasts/gpoddersync.h.mygpo-qt clementine-1.2.1/src/podcasts/gpoddersync.h ---- clementine-1.2.1/src/podcasts/gpoddersync.h.mygpo-qt 2012-07-17 12:27:37.000000000 -0500 -+++ clementine-1.2.1/src/podcasts/gpoddersync.h 2014-01-03 10:40:43.813394301 -0600 -@@ -27,7 +27,7 @@ - #include - #include - --#include -+#include - - class Application; - class Podcast; -diff -up clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp.mygpo-qt clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp ---- clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp.mygpo-qt 2012-07-17 12:27:37.000000000 -0500 -+++ clementine-1.2.1/src/podcasts/gpoddertoptagsmodel.cpp 2014-01-03 10:40:13.074721207 -0600 -@@ -20,7 +20,7 @@ - #include "podcast.h" - #include "core/closure.h" - --#include -+#include - - #include - -diff -up clementine-1.2.1/src/podcasts/gpoddertoptagspage.h.mygpo-qt clementine-1.2.1/src/podcasts/gpoddertoptagspage.h ---- clementine-1.2.1/src/podcasts/gpoddertoptagspage.h.mygpo-qt 2012-07-17 12:27:37.000000000 -0500 -+++ clementine-1.2.1/src/podcasts/gpoddertoptagspage.h 2014-01-03 10:40:48.849340744 -0600 -@@ -20,7 +20,7 @@ - - #include - --#include -+#include - - #include "addpodcastpage.h" - -diff -up clementine-1.2.1/src/podcasts/podcast.cpp.mygpo-qt clementine-1.2.1/src/podcasts/podcast.cpp ---- clementine-1.2.1/src/podcasts/podcast.cpp.mygpo-qt 2012-07-17 12:27:37.000000000 -0500 -+++ clementine-1.2.1/src/podcasts/podcast.cpp 2014-01-03 10:44:12.865171582 -0600 -@@ -21,7 +21,7 @@ - #include - #include - --#include -+#include - - const QStringList Podcast::kColumns = QStringList() - << "url" << "title" << "description" << "copyright" << "link" diff --git a/clementine-udisks-headers.patch b/clementine-udisks-headers.patch index 199661f..95ccd35 100644 --- a/clementine-udisks-headers.patch +++ b/clementine-udisks-headers.patch @@ -1,16 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1104542..65d765c 100644 +index afe58b9..a8c6773 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -887,7 +887,6 @@ if(HAVE_DBUS) - # Hack to get it to generate interfaces without namespaces - required - # because otherwise org::freedesktop::UDisks and - # org::freedesktop::UDisks::Device conflict. -- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) - - # MPRIS DBUS interfaces - qt4_add_dbus_adaptor(SOURCES -@@ -954,6 +953,8 @@ if(HAVE_DBUS) +@@ -953,6 +953,8 @@ if(HAVE_DBUS) list(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.h) list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.cpp) @@ -18,4 +10,4 @@ index 1104542..65d765c 100644 + # DeviceKit DBUS interfaces if(HAVE_DEVICEKIT) - qt4_add_dbus_interface(SOURCES + set_source_files_properties(dbus/org.freedesktop.UDisks.xml diff --git a/clementine.spec b/clementine.spec index 16697df..fcfba17 100644 --- a/clementine.spec +++ b/clementine.spec @@ -1,29 +1,23 @@ +%global pre_release rc1 + Name: clementine -Version: 1.2.3 -Release: 14%{?dist} +Version: 1.3.0 +Release: 0.1.%{pre_release}%{?dist} Summary: A music player and library organizer Group: Applications/Multimedia License: GPLv3+ and GPLv2+ URL: http://code.google.com/p/clementine-player -Source0: http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz - -# fix libmygpo-qt header references -Patch0: clementine-mygpo.patch -# desktop file fixes: -# * categories (+Audio) -# * non-compliant groups, https://code.google.com/p/clementine-player/issues/detail?id=2690 -Patch3: clementine-desktop.patch +Source0: http://clementine-player.googlecode.com/files/%{name}-%{version}%{pre_release}.tar.xz + Patch4: clementine-udisks-headers.patch -# Use bundled sha2 library -# https://github.com/clementine-player/Clementine/issues/4217 -Patch5: clementine-do-not-use-system-sha2.patch # fix compiler flag handling in gst/moodbar, upstreamable --rex Patch6: clementine-moodbar_flags.patch BuildRequires: boost-devel BuildRequires: cmake +BuildRequires: cryptopp-devel BuildRequires: desktop-file-utils BuildRequires: fftw-devel BuildRequires: gettext @@ -31,8 +25,8 @@ BuildConflicts: gmock-devel >= 1.6 %if 0%{?fedora} && 0%{?fedora} < 20 BuildRequires: gmock-devel %endif -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel +BuildRequires: gstreamer1-devel +BuildRequires: gstreamer1-plugins-base-devel BuildRequires: gtest-devel BuildRequires: libcdio-devel BuildRequires: libchromaprint-devel @@ -66,7 +60,7 @@ BuildRequires: dbus-x11 BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-xauth -Requires: gstreamer-plugins-good +Requires: gstreamer1-plugins-good Requires: hicolor-icon-theme Requires: qca-ossl%{?_isa} @@ -76,17 +70,15 @@ focusing on a fast and easy-to-use interface for searching and playing your music. %prep -%setup -q -%patch0 -p1 -b .mygpo -%patch3 -p1 -b .desktop +%setup -qn %{name}-%{version}%{pre_release} + %patch4 -p1 -b .udisks-headers -%patch5 -p1 -b .do-not-use-system-sha2 %patch6 -p1 -b .moodbar_flags # Remove most 3rdparty libraries -mv 3rdparty/{gmock,qocoa,qsqlite,sha2}/ . +mv 3rdparty/{gmock,qocoa,qsqlite,sha2,libmygpo-qt,vreen}/ . rm -fr 3rdparty/* -mv {gmock,qocoa,qsqlite,sha2}/ 3rdparty/ +mv {gmock,qocoa,qsqlite,sha2,libmygpo-qt,vreen}/ 3rdparty/ # Can't run all the unit tests # songloader requires internet connection @@ -140,14 +132,18 @@ update-desktop-database &> /dev/null || : %doc Changelog COPYING %{_bindir}/clementine %{_bindir}/clementine-tagreader +%{_datadir}/appdata/clementine.appdata.xml %{_datadir}/applications/clementine.desktop -%{_datadir}/icons/hicolor/*/apps/application-x-clementine.* +%{_datadir}/icons/hicolor/*/apps/clementine.* %{_datadir}/kde4/services/clementine-feed.protocol %{_datadir}/kde4/services/clementine-itms.protocol %{_datadir}/kde4/services/clementine-itpc.protocol %{_datadir}/kde4/services/clementine-zune.protocol %changelog +* Thu Jan 07 2016 Jan Grulich - 1.3.0-0.1rc1 +- Update to 1.3.0rc1 + * Tue Dec 01 2015 Jan Grulich - 1.2.3-14 - Requires: gstreamer-plugins-good diff --git a/sources b/sources index 0ffb515..1ac1675 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e97ed3e76187d599f39f1d3b7b8b5187 clementine-1.2.3.tar.gz +c709615f6c5061e5ff1f43bbb1f9255a clementine-1.3.0rc1.tar.xz