rpms/rhpl/F-9 rhpl-0.215-inet.patch,1.1,1.2 rhpl.spec,1.114,1.115

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/rpms/rhpl/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19127

Modified Files:
	rhpl-0.215-inet.patch rhpl.spec 
Log Message:
* Wed Apr 30 2008 Jeremy Katz <katzj at redhat.com> - 0.215-3
- Patch hadn't actually been applied, but we've adjusted the 
  xkeyboard-config to have the inet bits by default without needing to specify
  us+inet


rhpl-0.215-inet.patch:

Index: rhpl-0.215-inet.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/F-9/rhpl-0.215-inet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rhpl-0.215-inet.patch	14 Apr 2008 21:09:16 -0000	1.1
+++ rhpl-0.215-inet.patch	1 May 2008 03:16:39 -0000	1.2
@@ -6,7 +6,7 @@
              # Translators: the word before the bar is just context and
              # doesn't need to be translated. Only after will be translated.
 -            'us'                      : [N_('keyboard|U.S. English'), 'us+inet', 'pc105', '', ''],
-+            'us'                      : [N_('keyboard|U.S. English'), 'us', 'pc105+inet', '', ''],
++            'us'                      : [N_('keyboard|U.S. English'), 'us', 'pc105', '', ''],
              }
  
      def _get_models(self):


Index: rhpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpl/F-9/rhpl.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- rhpl.spec	14 Apr 2008 21:09:16 -0000	1.114
+++ rhpl.spec	1 May 2008 03:16:39 -0000	1.115
@@ -3,8 +3,9 @@
 Summary: Library of Python code used by installation and configuration tools
 Name: rhpl
 Version: 0.215
-Release: 2
+Release: 3
 Source0: %{name}-%{version}.tar.bz2
+Patch0: rhpl-0.215-inet.patch
 License: GPLv2+
 Group: System Environment/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -41,6 +43,11 @@
 %{python_sitearch}/rhpl
 
 %changelog
+* Wed Apr 30 2008 Jeremy Katz <katzj at redhat.com> - 0.215-3
+- Patch hadn't actually been applied, but we've adjusted the 
+  xkeyboard-config to have the inet bits by default without needing to specify
+  us+inet
+
 * Mon Apr 14 2008 Adam Jackson <ajax at redhat.com> 0.215-2
 - rhpl-0.215-inet.patch: Add inet keycodes to the model (like XKB expects)
   instead of to the layout (like it doesn't).