[firstboot/f14/master] - firstboot -> metacity dep (#605675)
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 15 19:35:23 UTC 2010
commit 59f335272e9fb02067687e0a5e6c728f83124c49
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Sep 15 14:30:10 2010 -0500
- firstboot -> metacity dep (#605675)
firstboot-1.113-kwin.patch | 14 ++++++++++++++
firstboot.spec | 11 +++++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/firstboot-1.113-kwin.patch b/firstboot-1.113-kwin.patch
new file mode 100644
index 0000000..7ee316f
--- /dev/null
+++ b/firstboot-1.113-kwin.patch
@@ -0,0 +1,14 @@
+diff -up firstboot-1.113/firstboot/xfrontend.py.kwin firstboot-1.113/firstboot/xfrontend.py
+--- firstboot-1.113/firstboot/xfrontend.py.kwin 2010-08-30 05:57:44.000000000 -0500
++++ firstboot-1.113/firstboot/xfrontend.py 2010-09-15 14:26:03.900021796 -0500
+@@ -42,7 +42,9 @@ class XFrontEnd:
+ self._wm_pid = os.fork()
+
+ if not self._wm_pid:
+- path = "/usr/bin/metacity"
++ paths = ["/usr/bin/metacity", "/usr/bin/kwin"]
++ for path in paths:
++ if os.access(path, os.X_OK): break
+ args = [path, "--display", os.environ["DISPLAY"]]
+ os.execvp(path, args)
+
diff --git a/firstboot.spec b/firstboot.spec
index 26d5de1..df0c49e 100644
--- a/firstboot.spec
+++ b/firstboot.spec
@@ -4,7 +4,7 @@ Summary: Initial system configuration utility
Name: firstboot
URL: http://fedoraproject.org/wiki/FirstBoot
Version: 1.113
-Release: 2%{?dist}
+Release: 3%{?dist}
# This is a Red Hat maintained package which is specific to
# our distribution. Thus the source is only available from
# within this srpm.
@@ -16,25 +16,29 @@ ExclusiveOS: Linux
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: python-devel, python-setuptools-devel
-Requires: metacity, pygtk2, python
+Requires: pygtk2, python
Requires: setuptool, libuser-python, system-config-users, system-config-date
Requires: authconfig-gtk, python-meh
Requires: system-config-keyboard
Requires: python-ethtool
Requires: cracklib-python
Requires: systemd-units
+Requires: firstboot(windowmanager)
Requires(post): chkconfig
%define debug_package %{nil}
Obsoletes: firstboot-tui < 1.90-1
+Patch1: firstboot-1.113-kwin.patch
+
%description
The firstboot utility runs after installation. It guides the user through
a series of steps that allows for easier configuration of the machine.
%prep
%setup -q
+%patch1 -p1 -b .kwin
%build
@@ -81,6 +85,9 @@ fi
/lib/systemd/system/firstboot-graphical.service
%changelog
+* Wed Sep 15 2010 Rex Dieter <rdieter at fedoraproject.org> 1.113-3
+- firstboot -> metacity dep (#605675)
+
* Tue Sep 14 2010 Bill Nottingham <notting at redhat.com> 1.113-2
- reenable sysv service
More information about the scm-commits
mailing list