[clementine] Fix startup on a fresh install RHBZ#773547 Some specfile clean-ups

Orcan Ogetbil oget at fedoraproject.org
Fri Jan 13 01:44:58 UTC 2012


commit 3b96bc60f213d4fc785735846d1b1f1c79e5576f
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Thu Jan 12 20:44:56 2012 -0500

    Fix startup on a fresh install RHBZ#773547
    Some specfile clean-ups

 clementine-fresh-start.patch  |    9 ++++
 clementine-gcc46.patch        |   37 ---------------
 clementine-gmock-system.patch |   98 -----------------------------------------
 clementine.spec               |   14 +++---
 4 files changed, 17 insertions(+), 141 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 835f05c..dc67c6b 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,6 +1,6 @@
 Name:           clementine
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A music player and library organizer
 
 Group:          Applications/Multimedia
@@ -15,8 +15,9 @@ Patch0:         clementine-lastfm-login-fix.patch
 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
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -60,6 +61,7 @@ music.
 %patch0 -p1 -b .lastfm
 %patch1 -p1 -b .glibmm24
 %patch2 -p1 -b .glib2
+%patch3 -p1 -b .fresh
 
 # Remove all 3rdparty libraries exceph universalchardet
 # as it is not available as a separate library.
@@ -89,7 +91,6 @@ pushd %{_target_platform}
 popd
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 
@@ -102,8 +103,6 @@ popd
 desktop-file-validate \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%clean
-rm -rf %{buildroot}
 
 %post
 update-desktop-database &> /dev/null || :
@@ -121,7 +120,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc Changelog COPYING TODO
 %{_bindir}/clementine
 %{_datadir}/applications/clementine.desktop
@@ -130,6 +128,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* 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
+
 * 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
 


More information about the scm-commits mailing list