rpms/openoffice.org/F-8 openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch, NONE, 1.1 openoffice.org.spec, 1.1340, 1.1341

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31722

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch 
Log Message:
Resolves: rhbz#425701/ooo#83410 try to fix serbian translations

openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch:

--- NEW FILE openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch ---
Index: inc/postset.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/postset.mk,v
retrieving revision 1.38
diff -u -r1.38 postset.mk
--- openoffice.org.orig/solenv/inc/postset.mk	29 May 2007 08:53:01 -0000	1.38
+++ openoffice.org/solenv/inc/postset.mk	11 Jan 2008 09:49:22 -0000
@@ -39,6 +39,6 @@
 defaultlangiso=en-US
 
 # Complete list of all supported ISO codes
-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn-IN ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN zh-TW zu
+completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn-IN ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh-YU sr ss st sv sw sw-TZ sx te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN zh-TW zu
 
 alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -r1.1340 -r1.1341
--- openoffice.org.spec	7 Jan 2008 15:44:20 -0000	1.1340
+++ openoffice.org.spec	11 Jan 2008 09:53:47 -0000	1.1341
@@ -42,7 +42,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN
 %else
 %define langpack_langs en-US
 %endif
@@ -161,6 +161,7 @@
 Patch79: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
 Patch80: openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
 Patch81: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+Patch82: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1117,6 +1118,7 @@
 %patch79 -p1 -b .ooo84770.svx.eventsmismatch.patch
 %patch80 -p1 -b .ooo81314.i18npool.crash.patch
 %patch81 -p1 -b .ooo85055.psprint.linetoolong.patch
+%patch82 -p1 -b .ooo83410.solenv.renameserbian.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -1182,6 +1184,12 @@
 fi
 deliver -link
 localize -m -x -l bn -f %{SOURCE5}
+
+# ooo#83410 serbian is still called sr-CS, rename translations to sr
+localize -e -l sr-CS -f ../../sr-CS.sdf
+sed -i -e "s/\tsr-CS\t/\tsr\t/" ../../sr-CS.sdf
+localize -m -x -l sr -f ../../sr-CS.sdf
+
 cd ../..
 
 #build OOo, on failure make a stab at debugging the crash if any, and
@@ -1347,7 +1355,7 @@
 nn	help		nolingu		western 	pl	help		*pl_PL*		western	\
 pt	help		nolingu		western 	pt-BR	help		nolingu		western	\
 ru	help		*hyph_ru_RU*	western 	sk	help		*sk_SK*		western	\
-sl	help		*hyph_sl_SI*	western 	sr-CS	nohelp		nolingu		western	\
+sl	help		*hyph_sl_SI*	western 	sr	nohelp		nolingu		western	\
 sv	help		nolingu		western 	ta-IN	nohelp		nolingu		ctl	\
 th	help		nolingu		ctl 		tr	help		nolingu		western	\
 zh-CN	help		nolingu		cjk 		zh-TW	help		nolingu		cjk	\
@@ -1615,7 +1623,7 @@
 %files langpack-ru	-f ru.filelist
 %files langpack-sk_SK	-f sk.filelist
 %files langpack-sl_SI	-f sl.filelist
-%files langpack-sr	-f sr-CS.filelist
+%files langpack-sr	-f sr.filelist
 %files langpack-sv	-f sv.filelist
 %files langpack-ta_IN	-f ta-IN.filelist
 %files langpack-th_TH	-f th.filelist
@@ -2817,8 +2825,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Jan 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.11.UNRELEASED
+* Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.11
 - Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+- Resolves: rhbz#425701/ooo#83410 try to fix serbian translations
 
 * Wed Jan 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.10
 - Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch