rpms/system-config-language/F-12 s-c-l_530698.patch, NONE, 1.1 system-config-language.spec, 1.57, 1.58

Pravin Satpute pravins at fedoraproject.org
Tue Oct 27 11:36:39 UTC 2009


Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21936

Modified Files:
	system-config-language.spec 
Added Files:
	s-c-l_530698.patch 
Log Message:
* Mon Oct 26 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-3
- fixed 530698


s-c-l_530698.patch:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE s-c-l_530698.patch ---
diff -rup system-config-language-1.3.3/Makefile system-config-language-1.3.3_mod/Makefile
--- system-config-language-1.3.3/Makefile	2009-09-23 12:29:48.000000000 +0530
+++ system-config-language-1.3.3_mod/Makefile	2009-10-26 16:48:47.955072133 +0530
@@ -27,8 +27,8 @@ install: ${PKGNAME}.desktop
 	mkdir -p $(INSTROOT)$(SECURITY_DIR)
 	mkdir -p $(INSTROOT)$(PKGDATADIR)/pixmaps
 	mkdir -p $(INSTROOT)/usr/share/applications
-	mkdir -p $(INSTROOT)/usr/share/firstboot
-	mkdir -p $(INSTROOT)/usr/share/firstboot/modules
+#	mkdir -p $(INSTROOT)/usr/share/firstboot
+#	mkdir -p $(INSTROOT)/usr/share/firstboot/modules
 	mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
 
 	install src/*.py $(INSTROOT)$(PKGDATADIR)
@@ -40,7 +40,7 @@ install: ${PKGNAME}.desktop
 	install pixmaps/${PKGNAME}.png $(INSTROOT)$(PKGDATADIR)/pixmaps/${PKGNAME}.png
 	install pixmaps/${PKGNAME}.png $(INSTROOT)/usr/share/icons/hicolor/48x48/apps
 	ln -sf consolehelper $(INSTROOT)/usr/bin/${PKGNAME}
-	ln -sf $(PKGDATADIR)/language_gui.py $(INSTROOT)/usr/share/firstboot/modules/language.py 
+#	ln -sf $(PKGDATADIR)/language_gui.py $(INSTROOT)/usr/share/firstboot/modules/language.py 
 	for d in $(SUBDIRS); do \
 	(cd $$d; $(MAKE) INSTROOT=$(INSTROOT) MANDIR=$(MANDIR) install) \
 		|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/F-12/system-config-language.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- system-config-language.spec	9 Oct 2009 06:08:46 -0000	1.57
+++ system-config-language.spec	27 Oct 2009 11:36:38 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Requires: yum >= 2.9.5
 Requires: gtk2 >= 2.6
 Obsoletes: locale_config  <= %{version}
 Patch1:         s-c-l_525040.patch
+Patch2:         s-c-l_530698.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -27,6 +28,7 @@ allows the user to change the default la
 %prep
 %setup -q
 %patch1 -p1 -b .1-525040
+%patch2 -p1 -b .1-530698
 
 %build
 make %{?_smp_mflags}
@@ -75,15 +77,18 @@ fi
 %{_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*
+#%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 26 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-3
+- fixed 530698
+
 * Fri Oct 09 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.3-2
 - fixed 525040
 




More information about the fedora-extras-commits mailing list