rpms/openoffice.org/devel .cvsignore, 1.211, 1.212 openoffice.org.spec, 1.1847, 1.1848 sources, 1.351, 1.352

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26435

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
yet more Indic translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- .cvsignore	5 Mar 2009 08:51:12 -0000	1.211
+++ .cvsignore	5 Mar 2009 10:09:49 -0000	1.212
@@ -17,3 +17,4 @@
 ta-090227.sdf
 OOO310_m4.tar.bz2
 Openoffice3.1-300m40-100per.tar.bz2
+ml-IN_DEV300_m40.sdf


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1847
retrieving revision 1.1848
diff -u -r1.1847 -r1.1848
--- openoffice.org.spec	5 Mar 2009 09:14:13 -0000	1.1847
+++ openoffice.org.spec	5 Mar 2009 10:09:49 -0000	1.1848
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 4
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -60,6 +60,8 @@
 Source16:       http://www.openoffice.org/nonav/issues/showattachment.cgi/57666/Maithili-mai-ooo3.0.sdf.tar.gz
 Source17:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60530/as-IN_DEV300_m40.sdf
 Source18:       http://sunvirtuallab.com:32305/sdf/090209/ta-090227.sdf
+Source19:       http://indian.googlecode.com/files/Openoffice3.1-300m40-100per.tar.bz2
+Source20:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60733/ml-IN_DEV300_m40.sdf
 BuildRequires:	zip, findutils, autoconf, flex, bison, icu, gcc-c++
 BuildRequires:	binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -1707,6 +1709,12 @@
 # i99663
 cp %{SOURCE18} .
 localize -m -x -l ta-IN -f ta-090227.sdf
+# i98746
+tar xjf %{SOURCE19}
+localize -m -x -l pa-IN -f Openoffice3.1-300m40-100per/pa-IN.sdf
+# i99907
+cp %{SOURCE20} .
+localize -m -x -l ml-IN -f ml-IN_DEV300_m40.sdf
 cd ../..
 
 #build OOo, on failure make a stab at debugging the crash if any, and
@@ -4106,6 +4114,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.2
+- Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations
+- Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations
+
 * Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.1
 - drop integrated workspace.gfbcrash.patch
 - drop integrated workspace.ooo31gsl2.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- sources	5 Mar 2009 08:51:12 -0000	1.351
+++ sources	5 Mar 2009 10:09:49 -0000	1.352
@@ -7,6 +7,8 @@
 eaf47e2e3d3586f6156c61379cc34df9  redhat-langpacks.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 d4cd987dca2f091c888d95d5aef19f46  GSI_fi.sdf.gz
+ab6765f3f969e0c676bc13bc9960f60c  ta-090227.sdf
+09f5e89995521ea566a6d44dd521ff55  Openoffice3.1-300m40-100per.tar.bz2
 0835c667327f7ffa5d7eed61b47d681e  Maithili-mai-ooo3.0.sdf.tar.gz
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 b6558e6e74c60dfd9fcd15a722188d45  mr-IN_DEV300_m40.sdf
@@ -14,6 +16,5 @@
 f457cdd91857701b1282bfffb0ec5e8a  kn-IN_DEV300_m40.sdf
 bdc3b2b8b90ac1879f216cfa3c50d7e1  hi-IN-D300-m40.tar.gz
 be8d6866609e7aa7282220c0f469b279  as-IN_DEV300_m40.sdf
-ab6765f3f969e0c676bc13bc9960f60c  ta-090227.sdf
-09f5e89995521ea566a6d44dd521ff55  Openoffice3.1-300m40-100per.tar.bz2
+d185576d40f1157cc1d25e8f72d5017a  ml-IN_DEV300_m40.sdf
 a133aed113ff6ce82e20583e39140b98  OOO310_m4.tar.bz2