rpms/system-config-keyboard/devel .cvsignore, 1.16, 1.17 sources, 1.20, 1.21 system-config-keyboard.spec, 1.48, 1.49 system-config-keyboard-1.2.15-beenset.patch, 1.1, NONE system-config-keyboard-1.2.15-ext.patch, 1.1, NONE system-config-keyboard-1.2.15-fixcomments.patch, 1.1, NONE system-config-keyboard-1.2.15-icon.patch, 1.1, NONE system-config-keyboard-1.2.15-nolayout.patch, 1.1, NONE system-config-keyboard-1.2.15-reconfig.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31933

Modified Files:
	.cvsignore sources system-config-keyboard.spec 
Removed Files:
	system-config-keyboard-1.2.15-beenset.patch 
	system-config-keyboard-1.2.15-ext.patch 
	system-config-keyboard-1.2.15-fixcomments.patch 
	system-config-keyboard-1.2.15-icon.patch 
	system-config-keyboard-1.2.15-nolayout.patch 
	system-config-keyboard-1.2.15-reconfig.patch 
Log Message:
* Mon Jul 27 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-1
- New upstream release
- Drop upstreamed patches
- Make arch-dependent
- Drop rphl dependency



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	12 Apr 2008 13:39:58 -0000	1.16
+++ .cvsignore	27 Jul 2009 01:48:05 -0000	1.17
@@ -1 +1 @@
-system-config-keyboard-1.2.15.tar.gz
+system-config-keyboard-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	12 Apr 2008 13:39:58 -0000	1.20
+++ sources	27 Jul 2009 01:48:05 -0000	1.21
@@ -1 +1 @@
-13a0e4444f7fcbb6a3e9c88f42285faf  system-config-keyboard-1.2.15.tar.gz
+8cb9171cb71beedd8359c959fb518628  system-config-keyboard-1.3.0.tar.gz


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- system-config-keyboard.spec	22 Jun 2009 17:18:13 -0000	1.48
+++ system-config-keyboard.spec	27 Jul 2009 01:48:07 -0000	1.49
@@ -1,30 +1,26 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:           system-config-keyboard
-Version:        1.2.15
-Release:        8%{?dist}.2
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        A graphical interface for modifying the keyboard
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://fedorahosted.org/system-config-keyboard/
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         system-config-keyboard-1.2.15-fixcomments.patch
-Patch1:         system-config-keyboard-1.2.15-beenset.patch
-Patch2:         system-config-keyboard-1.2.15-reconfig.patch
-Patch3:         system-config-keyboard-1.2.15-icon.patch
-Patch4:         system-config-keyboard-1.2.15-ext.patch
-Patch5:         system-config-keyboard-1.2.15-nolayout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
 
-Requires:       python2
+Requires:       python
 Requires:       usermode >= 1.36
-Requires:       rhpl >= 0.53
-Requires:       pyxf86config
 Requires:       firstboot
+%ifnarch s390 s390x
+Requires:       pyxf86config
+%endif
 
 Obsoletes:      kbdconfig
 Obsoletes:      redhat-config-keyboard
@@ -36,12 +32,6 @@ the user to change the default keyboard 
 
 %prep
 %setup -q
-%patch0 -p0 -b .fixcomments
-%patch1 -p1 -b .beenset
-%patch2 -p1 -b .reconfig
-%patch3 -p1 -b .icon
-%patch4 -p1 -b .ext
-%patch5 -p1 -b .nolayout
 
 
 %build
@@ -87,9 +77,16 @@ fi
 %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
+* Mon Jul 27 2009 Lubomir Rintel <lkundrak at v3.sk> 1.3.0-1
+- New upstream release
+- Drop upstreamed patches
+- Make arch-dependent
+- Drop rphl dependency
+
 * Mon Jun 22 2009 Karsten Hopp <karsten at redhat.com> 1.2.15-8.2
 - ifnarch doesn't work in noarch packages, undo last change
 


--- system-config-keyboard-1.2.15-beenset.patch DELETED ---


--- system-config-keyboard-1.2.15-ext.patch DELETED ---


--- system-config-keyboard-1.2.15-fixcomments.patch DELETED ---


--- system-config-keyboard-1.2.15-icon.patch DELETED ---


--- system-config-keyboard-1.2.15-nolayout.patch DELETED ---


--- system-config-keyboard-1.2.15-reconfig.patch DELETED ---