rpms/system-config-language/devel system-config-language-447008.patch, NONE, 1.1 system-config-language.spec, 1.40, 1.41

[Pravin Satpute (pravins)]

Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12616

Modified Files:
	system-config-language.spec 
Added Files:
	system-config-language-447008.patch 
Log Message:
* Thu May 22 2008 Pravin Satpute <psatpute at redhat.com> - 1.2.15-4
- fix bug 447008
- fix bug 429808
- fix bug 447879


system-config-language-447008.patch:

--- NEW FILE system-config-language-447008.patch ---
diff -rup system-config-language-1.2.15/src/language_gui.py system-config-language-1.2.15_mod/src/language_gui.py
--- system-config-language-1.2.15/src/language_gui.py	2008-01-15 08:15:16.000000000 +0530
+++ system-config-language-1.2.15_mod/src/language_gui.py	2008-05-22 13:50:36.000000000 +0530
@@ -42,7 +42,7 @@ translate.textdomain ("system-config-lan
 
 iconPixbuf = None      
 try:
-    iconPixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/system-config-language/pixmaps/system-config-language.png")
+    iconPixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/icons/gnome/32x32/apps/preferences-desktop-locale.png")
 except:
     pass
 
@@ -68,7 +68,7 @@ class childWindow:
         self.title = gtk.Label(_("Language Selection"))
         self.title.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse ("white"))
 
-        self.msgLabel = gtk.Label(_("Please select the default language for the system."))
+        self.msgLabel = gtk.Label(_(" Please select the default language for the system."))
         self.msgLabel.set_line_wrap(True)
         self.msgLabel.set_alignment(0.0, 0.5)
 
@@ -93,10 +93,10 @@ class childWindow:
         #Add icon to the top frame
         p = None
         try:
-            p = gtk.gdk.pixbuf_new_from_file("../pixmaps/system-config-language.png")
+            p = gtk.gdk.pixbuf_new_from_file("/usr/share/icons/gnome/32x32/apps/preferences-desktop-locale.png")
         except:
             try:
-                p = gtk.gdk.pixbuf_new_from_file("/usr/share/system-config-language/pixmaps/system-config-language.png")
+                p = gtk.gdk.pixbuf_new_from_file("/usr/share/icons/gnome/32x32/apps/preferences-desktop-locale.png")
             except:
                 pass
 
diff -rup system-config-language-1.2.15/system-config-language.desktop.in system-config-language-1.2.15_mod/system-config-language.desktop.in
--- system-config-language-1.2.15/system-config-language.desktop.in	2008-01-15 08:15:16.000000000 +0530
+++ system-config-language-1.2.15_mod/system-config-language.desktop.in	2008-05-22 13:48:56.000000000 +0530
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Language
 _Comment=Change the default system language
-Icon=system-config-language.png
+Icon=preferences-desktop-locale
 Exec=/usr/bin/system-config-language
 Type=Application
 StartupNotify=true


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-language.spec	28 Apr 2008 10:50:47 -0000	1.40
+++ system-config-language.spec	22 May 2008 12:22:50 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.2.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -20,6 +20,7 @@
 Requires: yum >= 2.9.5
 Requires: gtk2 >= 2.6
 Patch1: system-config-language-pirut_442901.patch
+Patch2: system-config-language-447008.patch
 Obsoletes: locale_config  <= %{version}
 
 %description
@@ -29,6 +30,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .1-pirut
+%patch2 -p1 -b .2-icon
+mv po/sr at Latn.po po/sr at latin.po
 
 %build
 make %{?_smp_mflags}
@@ -41,6 +44,10 @@
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/*.py* 
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/system-config-language
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/system-config-language
+chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/pixmaps/system-config-language.png
+chmod 0644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/system-config-language.png
+chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/locale-list
+
 
 desktop-file-install --vendor system --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -82,6 +89,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Thu May 22 2008 Pravin Satpute <psatpute at redhat.com> - 1.2.15-4
+- fix bug 447008
+- fix bug 429808
+- fix bug 447879
+
 * Mon Apr 28 2008 Pravin Satpute <psatpute at redhat.com> - 1.2.15-3
 - fix bug 442901