rpms/openoffice.org/devel openoffice.org.spec,1.1376,1.1377

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Jan 11 09:49:03 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#425701/ooo#83410 try and fix serbian translations


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1376
retrieving revision 1.1377
diff -u -r1.1376 -r1.1377
--- openoffice.org.spec	10 Jan 2008 18:03:23 -0000	1.1376
+++ openoffice.org.spec	11 Jan 2008 09:48:27 -0000	1.1377
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 1
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -138,6 +138,7 @@
 Patch64: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
 Patch65: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
 Patch66: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch67: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1090,6 +1091,7 @@
 %patch64 -p1 -b .ooo85097.desktop.pagein.patch
 %patch65 -p1 -b .oooXXXXX.solenv.paths.patch
 %patch66 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch67 -p1 -b .ooo83410.solenv.renameserbian.patch
 
 # temporary until hsqldb is updated in rawhide
 sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -1154,6 +1156,13 @@
 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 ../..
+
 cd ../..
 
 #build OOo, on failure make a stab at debugging the crash if any, and
@@ -2864,6 +2873,9 @@
 
 
 %changelog
+* Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.3
+- Resolves: rhbz#425701/ooo#83410 try and fix serbian translations
+
 * Thu Jan 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.2
 - add openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch to fix up -devel Requires
 - add openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch




More information about the fedora-extras-commits mailing list