|
|
@@ -2,15 +2,19 @@ Summary: A graphical interface for modifying the keyboard
|
|
|
Summary(ja): キーボードを変更するためのグラフィカルインタフェース
|
|
|
Name: system-config-keyboard
|
|
|
Epoch: 1
|
|
|
-Version: 1.2.11
|
|
|
+Version: 1.3.1
|
|
|
Release: 2%{?_dist_release}
|
|
|
URL: https://fedorahosted.org/system-config-keyboard/
|
|
|
-License: GPL
|
|
|
-ExclusiveOS: Linux
|
|
|
-Group: System Environment/Base
|
|
|
+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
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildArch: noarch
|
|
|
-Source0: %{name}-%{version}.tar.bz2
|
|
|
+ExclusiveOS: Linux
|
|
|
+Group: System Environment/Base
|
|
|
BuildRequires: desktop-file-utils
|
|
|
BuildRequires: gettext
|
|
|
BuildRequires: intltool
|
|
|
@@ -34,6 +38,10 @@ the user to change the default keyboard of the system.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
+%patch1 -p1
|
|
|
+
|
|
|
+%build
|
|
|
+%{__make}
|
|
|
|
|
|
%install
|
|
|
make INSTROOT=$RPM_BUILD_ROOT install
|
|
|
@@ -43,7 +51,7 @@ desktop-file-install --vendor system --delete-original \
|
|
|
--add-category Settings \
|
|
|
$RPM_BUILD_ROOT%{_datadir}/applications/system-config-keyboard.desktop
|
|
|
|
|
|
-%find_lang %name
|
|
|
+%find_lang %{name}
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
@@ -64,17 +72,27 @@ fi
|
|
|
%defattr(-,root,root)
|
|
|
#%doc COPYING
|
|
|
%{_bindir}/system-config-keyboard
|
|
|
+%{_sbindir}/system-config-keyboard
|
|
|
%dir %{_datadir}/system-config-keyboard
|
|
|
%{_datadir}/system-config-keyboard/*
|
|
|
%dir %{_datadir}/firstboot/
|
|
|
%dir %{_datadir}/firstboot/modules
|
|
|
%{_datadir}/firstboot/modules/*
|
|
|
%attr(0644,root,root) %{_datadir}/applications/system-config-keyboard.desktop
|
|
|
-%attr(0644,root,root) %config /etc/security/console.apps/system-config-keyboard
|
|
|
-%attr(0644,root,root) %config /etc/pam.d/system-config-keyboard
|
|
|
+%attr(0644,root,root) %config %{_sysconfdir}/security/console.apps/system-config-keyboard
|
|
|
+%attr(0644,root,root) %config %{_sysconfdir}/pam.d/system-config-keyboard
|
|
|
%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-keyboard.png
|
|
|
+%{python_sitelib}/system_config_keyboard
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Mar 30 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.1-2
|
|
|
+- add patch1
|
|
|
+ - do not add keyboard settings to xorg.conf
|
|
|
+ - remove keyboard settings from xorg.conf
|
|
|
+
|
|
|
+* Fri Mar 12 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.1-1
|
|
|
+- update to 1.3.1
|
|
|
+
|
|
|
* Sat Aug 22 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1:1.2.11-2
|
|
|
- revert to 1.2.11
|
|
|
|
daisuke