[clementine] New upstream release RHBZ#772175

Orcan Ogetbil oget at fedoraproject.org
Fri Feb 3 13:02:13 UTC 2012 

commit 16ee54fe06444bc466632b58dda07416bd9da719
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Feb 3 08:02:09 2012 -0500

    New upstream release RHBZ#772175

 .gitignore                        |    1 +
 clementine-desktop.patch          |   36 +++++++++++++++++++++++++++++
 clementine-fresh-start.patch      |    9 -------
 clementine-glib2-2.30.patch       |   12 ---------
 clementine-glibmm24-2.30.patch    |   44 -----------------------------------
 clementine-lastfm-login-fix.patch |   27 ---------------------
 clementine-system-sha2.patch      |   46 +++++++++++++++++++++++++++++++++++++
 clementine.spec                   |   46 +++++++++++++++++++++++-------------
 sources                           |    2 +-
 9 files changed, 113 insertions(+), 110 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 24a3bc9..6697432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clementine-0.4.2.tar.gz
 /clementine-0.6.tar.gz
 /clementine-0.7.tar.gz
 /clementine-0.7.1.tar.gz
+/clementine-1.0.1.tar.gz
diff --git a/clementine-desktop.patch b/clementine-desktop.patch
new file mode 100644
index 0000000..81d22b7
--- /dev/null
+++ b/clementine-desktop.patch
@@ -0,0 +1,36 @@
+diff -rupN clementine-1.0.1.old/dist/clementine.desktop clementine-1.0.1/dist/clementine.desktop
+--- clementine-1.0.1.old/dist/clementine.desktop	2011-12-02 16:24:43.000000000 -0500
++++ clementine-1.0.1/dist/clementine.desktop	2012-02-02 20:43:23.167651020 -0500
+@@ -15,27 +15,27 @@ 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-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Previous;Next;
+ 
+-[Play Shortcut Group] 
++[X-Play Shortcut Group]
+ Name=Play
+ Exec=clementine --play 
+ TargetEnvironment=Unity
+ 
+-[Pause Shortcut Group] 
++[X-Pause Shortcut Group]
+ Name=Pause
+ Exec=clementine --pause
+ TargetEnvironment=Unity
+ 
+-[Stop Shortcut Group] 
++[X-Stop Shortcut Group]
+ Name=Stop
+ Exec=clementine --stop
+ TargetEnvironment=Unity
+ 
+-[Previous Shortcut Group] 
++[X-Previous Shortcut Group]
+ Name=Previous
+ Exec=clementine --previous
+ TargetEnvironment=Unity
+ 
+-[Next Shortcut Group] 
++[X-Next Shortcut Group]
+ Name=Next
+ Exec=clementine --next
+ TargetEnvironment=Unity
diff --git a/clementine-system-sha2.patch b/clementine-system-sha2.patch
new file mode 100644
index 0000000..fdae213
--- /dev/null
+++ b/clementine-system-sha2.patch
@@ -0,0 +1,46 @@
+diff -rupN clementine-1.0.1.old/CMakeLists.txt clementine-1.0.1/CMakeLists.txt
+--- clementine-1.0.1.old/CMakeLists.txt	2012-01-22 07:43:26.000000000 -0500
++++ clementine-1.0.1/CMakeLists.txt	2012-01-22 22:52:58.904546367 -0500
+@@ -367,12 +367,20 @@ if(NOT CHROMAPRINT_FOUND)
+   endif(WIN32)
+ endif(NOT CHROMAPRINT_FOUND)
+ 
++# 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)
++
+ # Subdirectories
+ add_subdirectory(src)
+ if (WIN32)
+   add_subdirectory(3rdparty/qtwin)
+ endif (WIN32)
+-add_subdirectory(3rdparty/sha2)
+ add_subdirectory(3rdparty/universalchardet)
+ add_subdirectory(tests)
+ add_subdirectory(dist)
+diff -rupN clementine-1.0.1.old/src/CMakeLists.txt clementine-1.0.1/src/CMakeLists.txt
+--- clementine-1.0.1.old/src/CMakeLists.txt	2012-01-22 07:43:26.000000000 -0500
++++ clementine-1.0.1/src/CMakeLists.txt	2012-01-22 22:54:02.369214800 -0500
+@@ -12,7 +12,7 @@ endif(BUILD_WERROR)
+ 
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories(../3rdparty/gmock/gtest/include)
+-include_directories(../3rdparty/sha2)
++include_directories(${SHA2_INCLUDE_DIRS})
+ if(WIN32)
+   include_directories(../3rdparty/qtwin)
+ endif(WIN32)
+@@ -961,7 +961,7 @@ add_dependencies(clementine_lib pot)
+ 
+ target_link_libraries(clementine_lib
+   chardet
+-  sha2
++  ${SHA2_LIBRARIES}
+   ${CHROMAPRINT_LIBRARIES}
+   ${ECHONEST_LIBRARIES}
+   ${GOBJECT_LIBRARIES}
diff --git a/clementine.spec b/clementine.spec
index 9cd03b6..d718531 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,6 +1,6 @@
 Name:           clementine
-Version:        0.7.1
-Release:        6%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        A music player and library organizer
 
 Group:          Applications/Multimedia
@@ -8,16 +8,12 @@ License:        GPLv3+ and GPLv2+
 URL:            http://code.google.com/p/clementine-player
 Source0:        http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
 
-# Fixes lastfm login issue. From upstream trunk
-# RHBZ#757280 upstream#2438
-Patch0:         clementine-lastfm-login-fix.patch
-# Fixes build against newer glibmm24. From upstream trunk
-Patch1:         clementine-glibmm24-2.30.patch
-# Fixes build against newer glib2. From upstream trunk
-Patch2:         clementine-glib2-2.30.patch
-# Fixes startup on a fresh install. From upstream trunk
-Patch3:         clementine-fresh-start.patch
-
+# Use system sha2. Patch accepted by upstream
+# http://code.google.com/p/clementine-player/issues/detail?id=2623
+Patch0:         clementine-system-sha2.patch
+# Desktop file fixes. Sent upstream
+# http://code.google.com/p/clementine-player/issues/detail?id=2690
+Patch1:         clementine-desktop.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -25,7 +21,11 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gmock-devel
 BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  gtest-devel
+BuildRequires:  kdeplasma-addons-devel
+BuildRequires:  libcdio-devel
+BuildRequires:  libchromaprint-devel
 BuildRequires:  libechonest-devel
 %ifnarch s390 s390x
 BuildRequires:  libgpod-devel
@@ -38,10 +38,14 @@ BuildRequires:  libplist-devel
 BuildRequires:  libprojectM-devel >= 2.0.1-7
 BuildRequires:  libqxt-devel
 BuildRequires:  notification-daemon
+BuildRequires:  protobuf-devel
+BuildRequires:  qca2-devel
 BuildRequires:  qt4-devel
+BuildRequires:  qjson-devel
 BuildRequires:  qtiocompressor-devel
 BuildRequires:  qtsinglecoreapplication-devel
 BuildRequires:  qtsingleapplication-devel >= 2.6.1-2
+BuildRequires:  sha2-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  taglib-devel
 BuildRequires:  xorg-x11-server-Xvfb
@@ -58,10 +62,8 @@ music.
 
 %prep
 %setup -q
-%patch0 -p1 -b .lastfm
-%patch1 -p1 -b .glibmm24
-%patch2 -p1 -b .glib2
-%patch3 -p1 -b .fresh
+%patch0 -p1
+%patch1 -p1
 
 # Remove all 3rdparty libraries exceph universalchardet
 # as it is not available as a separate library.
@@ -84,6 +86,7 @@ pushd %{_target_platform}
         -DUSE_SYSTEM_PROJECTM=1 \
         -DUSE_SYSTEM_QXT=1 \
         -DSTATIC_SQLITE=0 \
+        -DENABLE_PLASMARUNNER=1 \
         .. 
 
     # Parallel build fails sometimes
@@ -100,6 +103,7 @@ pushd %{_target_platform}
     # Yet the tests still fail sometimes
     xvfb-run -a -n 10 make test ||:
 popd
+
 desktop-file-validate \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
@@ -120,14 +124,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%doc Changelog COPYING TODO
+%doc Changelog COPYING
 %{_bindir}/clementine
 %{_datadir}/applications/clementine.desktop
 %{_datadir}/icons/hicolor/64x64/apps/application-x-clementine.png
 %{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg
+%{_libdir}/kde4/plasma_runner_clementine.so
+%{_datadir}/kde4/services/plasma-runner-clementine.desktop
 
 
 %changelog
+* Thu Feb 02 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.1-1
+- New upstream release RHBZ#772175
+
 * Thu Jan 12 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.7.1-6
 - Fix startup on a fresh install RHBZ#773547
 - Some specfile clean-ups
@@ -135,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
+* Tue Jan 10 2012 Rex Dieter <rdieter at fedoraproject.org> 0.7.1-4.1
+- rebuild (libechonest)
+
 * Tue Nov 29 2011 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.7.1-4
 - Lastfm login fix RHBZ#757280
 - Patches for building against newer glibmm24 and glib2
diff --git a/sources b/sources
index cba7275..5e5f73e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-997f38d6bbd6b2fa9bf587eb89c5c2ec  clementine-0.7.1.tar.gz
+54dc47eb2de5960cd1654e1249a59bc6  clementine-1.0.1.tar.gz

More information about the scm-commits mailing list