Browse Source

update patches for anaconda

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4008 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
9641b62037
1 changed files with 10 additions and 2 deletions
  1. 10 2
      s/system-config-keyboard/system-config-keyboard-vl.spec

+ 10 - 2
s/system-config-keyboard/system-config-keyboard-vl.spec

@@ -3,13 +3,14 @@ Summary(ja): キーボードを変更するためのグラフィカルインタ
 Name: system-config-keyboard
 Epoch: 1
 Version: 1.3.1
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 URL: https://fedorahosted.org/system-config-keyboard/
 License: GPLv2+
 
 Source0: https://fedorahosted.org/releases/s/y/system-config-keyboard/%{name}-%{version}.tar.gz
 
 Patch1: system-config-keyboard-1.3.1-donot-modify-xorgconf.patch
+Patch2: system-config-keyboard-1.3.1-no-dbus.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
@@ -26,7 +27,8 @@ Requires: usermode >= 1.36
 Requires: rhpl >= 0.53
 Requires: pyxf86config
 Requires: firstboot
-Prereq: gtk2 >= 2.6
+Requires(post): gtk2
+Requires(postun): gtk2
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -43,6 +45,7 @@ the user to change the default keyboard of the system.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make}
@@ -89,6 +92,11 @@ fi
 %{python_sitelib}/system_config_keyboard
 
 %changelog
+* Mon May 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.1-4
+- fix patch1
+- add patch2 to work in anaconda
+- use Require(post) instead of PreReq
+
 * Wed Apr 20 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.1-3
 - rebuild for Vine 6