[clementine] Re-add the fresh start patch. Looks like it didn't make it to 1.0.1
Orcan Ogetbil
oget at fedoraproject.org
Thu Feb 9 03:42:31 UTC 2012
commit 0570c18295adba8a9ed7b1131b11446c8c3e870a
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Wed Feb 8 22:42:29 2012 -0500
Re-add the fresh start patch. Looks like it didn't make it to 1.0.1
- Include plasma addon only in F-17+
clementine-fresh-start.patch | 9 +++++++++
clementine.spec | 17 +++++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/clementine-fresh-start.patch b/clementine-fresh-start.patch
new file mode 100644
index 0000000..9bf1297
--- /dev/null
+++ b/clementine-fresh-start.patch
@@ -0,0 +1,9 @@
+diff -rupN clementine-0.7.1.old/data/schema/schema.sql clementine-0.7.1/data/schema/schema.sql
+--- clementine-0.7.1.old/data/schema/schema.sql 2011-03-29 15:16:12.000000000 -0400
++++ clementine-0.7.1/data/schema/schema.sql 2012-01-12 19:15:39.889374607 -0500
+@@ -35,4 +35,5 @@ CREATE TABLE songs (
+ CREATE TABLE schema_version (
+ version INTEGER NOT NULL
+ );
++
+ INSERT INTO schema_version (version) VALUES (0);
diff --git a/clementine.spec b/clementine.spec
index d718531..14276a7 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,6 +1,6 @@
Name: clementine
Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A music player and library organizer
Group: Applications/Multimedia
@@ -14,6 +14,9 @@ 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
+# Fixes startup on a fresh install. From upstream trunk
+Patch2: clementine-fresh-start.patch
+
BuildRequires: boost-devel
BuildRequires: cmake
@@ -23,7 +26,9 @@ BuildRequires: gmock-devel
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
BuildRequires: gtest-devel
+%if 0%{fedora} > 16
BuildRequires: kdeplasma-addons-devel
+%endif
BuildRequires: libcdio-devel
BuildRequires: libchromaprint-devel
BuildRequires: libechonest-devel
@@ -64,6 +69,7 @@ music.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# Remove all 3rdparty libraries exceph universalchardet
# as it is not available as a separate library.
@@ -86,7 +92,9 @@ pushd %{_target_platform}
-DUSE_SYSTEM_PROJECTM=1 \
-DUSE_SYSTEM_QXT=1 \
-DSTATIC_SQLITE=0 \
+%if 0%{fedora} > 16
-DENABLE_PLASMARUNNER=1 \
+%endif
..
# Parallel build fails sometimes
@@ -129,11 +137,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/applications/clementine.desktop
%{_datadir}/icons/hicolor/64x64/apps/application-x-clementine.png
%{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg
+%if 0%{fedora} > 16
%{_libdir}/kde4/plasma_runner_clementine.so
%{_datadir}/kde4/services/plasma-runner-clementine.desktop
-
+%endif
%changelog
+* Thu Feb 07 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.1-2
+- Re-add the fresh start patch. Looks like it didn't make it to 1.0.1
+- Include plasma addon only in F-17+
+
* Thu Feb 02 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.1-1
- New upstream release RHBZ#772175
More information about the scm-commits
mailing list