From e0ba0da9df91cc9e07380d71ff10a2409d3f973e Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sat, 28 Jan 2012 13:47:39 +0000 Subject: [PATCH] - up to 1.0.1 - BR: protobuf-devel, qjson-devel - BR: liblastfm-devel >= 0.3.3 (for ) Changed files: clementine.spec -> 1.45 unbundle-po.patch -> 1.5 --- clementine.spec | 12 +++++++----- unbundle-po.patch | 12 ++++++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/clementine.spec b/clementine.spec index 1e67ec6..6010dc8 100644 --- a/clementine.spec +++ b/clementine.spec @@ -10,13 +10,13 @@ Summary: A music player and library organiser Summary(hu.UTF-8): Egy zenelejátszó és gyűjtemény-kezelő Name: clementine -Version: 0.7.1 -Release: 4 +Version: 1.0.1 +Release: 1 License: GPL v3 and GPL v2+ Group: Applications/Multimedia URL: http://www.clementine-player.org/ Source0: http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz -# Source0-md5: 997f38d6bbd6b2fa9bf587eb89c5c2ec +# Source0-md5: 54dc47eb2de5960cd1654e1249a59bc6 Patch0: desktop-install.patch Patch1: unbundle-po.patch BuildRequires: QtCore-devel >= %{qtver} @@ -40,7 +40,7 @@ BuildRequires: gtest-devel BuildRequires: libgpod-devel >= 0.7.92 BuildRequires: libimobiledevice-devel BuildRequires: libindicate-qt-devel -BuildRequires: liblastfm-devel +BuildRequires: liblastfm-devel >= 0.3.3 BuildRequires: libmtp-devel BuildRequires: libplist-devel %{!?with_static_projectm:BuildRequires: libprojectM-devel >= 1:2.0.1-4} @@ -48,6 +48,8 @@ BuildRequires: libqxt-devel BuildRequires: libxml2-devel BuildRequires: pkgconfig BuildRequires: pkgconfig +BuildRequires: protobuf-devel +BuildRequires: qjson-devel BuildRequires: qt4-build >= %{qtver} BuildRequires: qt4-linguist BuildRequires: qt4-qmake @@ -138,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc Changelog TODO +%doc Changelog %attr(755,root,root) %{_bindir}/clementine %{_desktopdir}/clementine.desktop %{_pixmapsdir}/clementine.png diff --git a/unbundle-po.patch b/unbundle-po.patch index 45e2b3c..5d4858d 100644 --- a/unbundle-po.patch +++ b/unbundle-po.patch @@ -39,8 +39,16 @@ Author: Elan Ruusamäe LoadTranslation("clementine", QDir::currentPath(), language); // Icons ---- clementine-0.5.3/src/ui/settingsdialog.cpp~ 2010-10-19 11:24:36.488320486 +0300 -+++ clementine-0.5.3/src/ui/settingsdialog.cpp 2010-10-19 11:24:40.594127569 +0300 +--- clementine-0.5.3/src/ui/behavioursettingspage.cpp~ 2010-10-19 11:24:36.488320486 +0300 ++++ clementine-0.5.3/src/ui/behavioursettingspage.cpp 2010-10-19 11:24:40.594127569 +0300 +@@ -21,6 +21,7 @@ + #include "playlist/playlist.h" + + #include ++#include + + + BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog* dialog) @@ -93,15 +93,22 @@ // Populate the language combo box. We do this by looking at all the -- 2.44.0