drop the yelp focus patch

This commit is contained in:
Matthias Clasen 2014-08-13 10:45:06 -04:00
parent 6fe5b45bc1
commit a8f80e18b0
2 changed files with 4 additions and 14 deletions

View File

@ -1,16 +1,12 @@
Name: gnome-initial-setup Name: gnome-initial-setup
Version: 3.13.4 Version: 3.13.4
Release: 1%{?dist} Release: 2%{?dist}
Summary: Bootstrapping your OS Summary: Bootstrapping your OS
License: GPLv2+ License: GPLv2+
URL: https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup URL: https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup
Source0: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/%{name}/3.13/%{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.6.4 %global nm_version 0.9.6.4
%global glib_required_version 2.36.0 %global glib_required_version 2.36.0
%global gtk_required_version 3.11.3 %global gtk_required_version 3.11.3
@ -68,7 +64,6 @@ you through configuring it. It is integrated with gdm.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .yelp-fixes
%build %build
%configure %configure
@ -107,6 +102,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
%{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
%changelog %changelog
* Wed Aug 13 2014 Matthias Clasen <mclasen@redhat.com> - 3.13.4-2
- Drop the yelp focus patch (we've dropped the yelp patch it depends on)
* Fri Jul 25 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.4-1 * Fri Jul 25 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.4-1
- Update to 3.13.4 - Update to 3.13.4

View File

@ -1,8 +0,0 @@
--- gnome-initial-setup-3.10.0/data/gnome-welcome-tour.yelp-fixes 2013-08-30 00:29:26.000000000 +0200
+++ gnome-initial-setup-3.10.0/data/gnome-welcome-tour 2013-09-25 15:41:22.897967924 +0200
@@ -18,4 +18,4 @@
EOF
fi
-yelp help:gnome-help/getting-started
+yelp --dont-steal-focus help:gnome-help/getting-started