[gnome-initial-setup] 0.5

Matthias Clasen mclasen at fedoraproject.org
Fri Jan 11 20:50:12 UTC 2013


commit 2f092dccbe2fa20c9d24f82b6a70131486bd8527
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Jan 11 15:50:42 2013 -0500

    0.5

 gnome-initial-setup.spec |    3 ++-
 yelp-fixes.patch         |   10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index 4545adc..c1f566e 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -8,6 +8,7 @@ URL:            https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup
 Source0:        http://download.gnome.org/sources/%{name}/0.5/%{name}-%{version}.tar.xz
 
 # this depends on a yelp patch that hasn't been merged upstream yet
+# https://bugzilla.gnome.org/show_bug.cgi?id=687957
 Patch0: yelp-fixes.patch
 
 %global nm_version 0.9
@@ -58,7 +59,7 @@ you through configuring it. It is integrated with gdm.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .yelp-fixes
 
 %build
 %configure
diff --git a/yelp-fixes.patch b/yelp-fixes.patch
index d87466b..ef97e11 100644
--- a/yelp-fixes.patch
+++ b/yelp-fixes.patch
@@ -1,9 +1,11 @@
 diff -up gnome-initial-setup-0.5/data/gnome-welcome-tour.yelp-fixes gnome-initial-setup-0.5/data/gnome-welcome-tour
---- gnome-initial-setup-0.5/data/gnome-welcome-tour.yelp-fixes	2013-01-11 14:55:30.964471647 -0500
-+++ gnome-initial-setup-0.5/data/gnome-welcome-tour	2013-01-11 14:55:46.286471100 -0500
-@@ -25,4 +25,4 @@ for name in $locale $lang 'C'; do
+--- gnome-initial-setup-0.5/data/gnome-welcome-tour.yelp-fixes	2012-12-20 15:12:43.000000000 -0500
++++ gnome-initial-setup-0.5/data/gnome-welcome-tour	2013-01-11 15:47:59.734958294 -0500
+@@ -24,5 +24,5 @@ for name in $locale $lang 'C'; do
+         fi
  done
  
- /usr/libexec/gnome-initial-setup-player $intro_path/figures/yelp-intro0001-0535.ogg &
+-/usr/libexec/gnome-initial-setup-player $intro_path/figures/yelp-intro0001-0535.ogg &
 -yelp help:getting-started
++/usr/libexec/gnome-initial-setup-player $intro_path/figures/yelp-intro.webm &
 +yelp --dont-steal-focus help:getting-started


More information about the scm-commits mailing list