From 5cd7b789bc786cabaa62f3f94981048c8e516317 Mon Sep 17 00:00:00 2001
From: Pravin Satpute <pravins@fedoraproject.org>
Date: May 22 2008 12:22:50 +0000
Subject: - fix bug 447008

- fix bug 429808
- fix bug 447879

---

diff --git a/system-config-language-447008.patch b/system-config-language-447008.patch
new file mode 100644
index 0000000..1b2eb10
--- /dev/null
+++ b/system-config-language-447008.patch
@@ -0,0 +1,46 @@
+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
diff --git a/system-config-language.spec b/system-config-language.spec
index cf1c3d5..7a663ff 100644
--- a/system-config-language.spec
+++ b/system-config-language.spec
@@ -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: usermode >= 1.36
 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 @@ allows the user to change the default language of the system.
 %prep
 %setup -q
 %patch1 -p1 -b .1-pirut
+%patch2 -p1 -b .2-icon
+mv po/sr@Latn.po po/sr@latin.po
 
 %build
 make %{?_smp_mflags}
@@ -41,6 +44,10 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/system-config-language/
 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 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Thu May 22 2008 Pravin Satpute <psatpute@redhat.com> - 1.2.15-4
+- fix bug 447008
+- fix bug 429808
+- fix bug 447879
+
 * Mon Apr 28 2008 Pravin Satpute <psatpute@redhat.com> - 1.2.15-3
 - fix bug 442901