[system-config-language/f14/master] * Mon Oct 4 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-2 - Spec file updated according to new guid

Naveen Kumar nkumar at fedoraproject.org
Mon Oct 4 12:03:50 UTC 2010 

commit 2eecaea519f206401829ea30d0709cd9d80bb77c
Author: Naveen Kumar <nkumar at redhat.com>
Date:   Mon Oct 4 17:31:10 2010 +0530

    * Mon Oct 4 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-2
    - Spec file updated according to new guidelines
    - resolves bug #624008
    - apply patch s-c-l-624008.patch
    - adds Low-German (nds_DE) to s-c-l
    - comment a redundant line in language_backend.py

 s-c-l-624008.patch          |   41 +++++++++++++++++++++++++++++++++++++++++
 system-config-language.spec |   43 +++++++++++++++++++++----------------------
 2 files changed, 62 insertions(+), 22 deletions(-)
---
diff --git a/s-c-l-624008.patch b/s-c-l-624008.patch
new file mode 100644
index 0000000..2b08392
--- /dev/null
+++ b/s-c-l-624008.patch
@@ -0,0 +1,41 @@
+Binary files system-config-language-1.3.5/src/gui_detailsDialog.pyc and system-config-language-1.3.5mod/src/gui_detailsDialog.pyc differ
+Binary files system-config-language-1.3.5/src/gui_errors.pyc and system-config-language-1.3.5mod/src/gui_errors.pyc differ
+Binary files system-config-language-1.3.5/src/gui_install.pyc and system-config-language-1.3.5mod/src/gui_install.pyc differ
+Binary files system-config-language-1.3.5/src/gui_progress.pyc and system-config-language-1.3.5mod/src/gui_progress.pyc differ
+diff -uNr system-config-language-1.3.5/src/lang_dict.py system-config-language-1.3.5mod/src/lang_dict.py
+--- system-config-language-1.3.5/src/lang_dict.py	2010-08-26 15:01:06.000000000 +0530
++++ system-config-language-1.3.5mod/src/lang_dict.py	2010-10-01 19:26:58.019691200 +0530
+@@ -80,6 +80,7 @@
+              "de_AT.UTF-8":"german-support", \
+              "de_BE.UTF-8":"german-support", \
+              "de_DE.UTF-8":"german-support", \
++	     "nds_DE.UTF-8":"low-german-support", \
+              "de_LU.UTF-8":"german-support", \
+              "de_CH.UTF-8":"german-support", \
+              "el_GR.UTF-8":"greek-support", \
+Binary files system-config-language-1.3.5/src/lang_dict.pyc and system-config-language-1.3.5mod/src/lang_dict.pyc differ
+diff -uNr system-config-language-1.3.5/src/language_backend.py system-config-language-1.3.5mod/src/language_backend.py
+--- system-config-language-1.3.5/src/language_backend.py	2010-08-26 15:01:06.000000000 +0530
++++ system-config-language-1.3.5mod/src/language_backend.py	2010-10-01 19:29:22.613557242 +0530
+@@ -134,7 +134,7 @@
+ 
+         # hack for writing information to grub.conf, thanks to  Hans de Goede  <hdegoede at redhat.com> for mentioning this.
+         # resolves RHBZ bug # 545499
+-        (cmdstatus, cmdout)= commands.getstatusoutput('/sbin/new-kernel-pkg --package kernel --dracut --install $(uname -r)')        
++        # (cmdstatus, cmdout)= commands.getstatusoutput('/sbin/new-kernel-pkg --package kernel --dracut --install $(uname -r)')        
+ 
+         (cmdstatus, cmdout)= commands.getstatusoutput('rpm -q kernel kernel-PAE | grep -v kernel-PAE ')
+         kernels=cmdout.split('\n')
+Binary files system-config-language-1.3.5/src/language_backend.pyc and system-config-language-1.3.5mod/src/language_backend.pyc differ
+Binary files system-config-language-1.3.5/src/language_gui.pyc and system-config-language-1.3.5mod/src/language_gui.pyc differ
+diff -uNr system-config-language-1.3.5/src/locale-list system-config-language-1.3.5mod/src/locale-list
+--- system-config-language-1.3.5/src/locale-list	2010-08-26 15:01:06.000000000 +0530
++++ system-config-language-1.3.5mod/src/locale-list	2010-10-01 19:25:19.993555776 +0530
+@@ -63,6 +63,7 @@
+ de_AT.UTF-8 utf8 latarcyrheb-sun16 German (Austria)
+ de_BE.UTF-8 utf8 latarcyrheb-sun16 German (Belgium)
+ de_DE.UTF-8 utf8 latarcyrheb-sun16 German (Germany) -   Deutsch
++nds_DE.UTF-8 utf8 latarcyrheb-sun16 Low German (Germany) -   Deutsch
+ de_LU.UTF-8 utf8 latarcyrheb-sun16 German (Luxemburg)
+ de_CH.UTF-8 utf8 latarcyrheb-sun16 German (Switzerland)
+ el_GR.UTF-8 utf8 iso07u-16 Greek
diff --git a/system-config-language.spec b/system-config-language.spec
index 6252274..60fd029 100644
--- a/system-config-language.spec
+++ b/system-config-language.spec
@@ -1,23 +1,22 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://fedorahosted.org/system-config-language/
 Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.bz2
+Patch0: s-c-l-624008.patch
 License: GPLv2
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
 Requires: pygtk2
 Requires: python2
-Requires: usermode >= 1.36
-Requires: usermode-gtk >= 1.36
-Requires: yum >= 2.9.5
-Requires: gtk2 >= 2.6
-Obsoletes: locale_config  <= %{version}
+Requires: usermode
+Requires: usermode-gtk
+Requires: yum
+Requires: gtk2
 
 %description
 system-config-language is a graphical user interface that 
@@ -25,12 +24,12 @@ allows the user to change the default language of the system.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make INSTROOT=$RPM_BUILD_ROOT install
 install $RPM_BUILD_DIR/system-config-language-%{version}/yumhelpers.glade $RPM_BUILD_ROOT%{_datadir}/system-config-language
 
@@ -55,37 +54,37 @@ desktop-file-install --vendor system --delete-original       \
 
 %find_lang %name
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-#%doc doc/*
 %{_bindir}/system-config-language
 %dir %{_datadir}/system-config-language
 %{_datadir}/system-config-language/*
-#%dir %{_datadir}/firstboot/
-#%dir %{_datadir}/firstboot/modules
-#%{_datadir}/firstboot/modules/language.py*
 %{_datadir}/applications/system-config-language.desktop
 %{_datadir}/icons/hicolor/48x48/apps/system-config-language.png
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-language
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Mon Oct 4 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-2
+- Spec file updated according to new guidelines
+- resolves bug #624008
+- apply patch s-c-l-624008.patch
+- adds Low-German (nds_DE) to s-c-l
+- comment a redundant line in language_backend.py
+
 * Wed Sep 8 2010 Naveen Kumar <nkumar at redhat.com>- 1.3.5-1
 - new release by upstream
 - upload new source system-config-language-1.3.5.tar.bz2

More information about the scm-commits mailing list