rpms/openoffice.org/devel openoffice.org.spec, 1.1855, 1.1856 sources, 1.354, 1.355 workspace.localization35.patch, 1.2, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Removed Files:
	workspace.localization35.patch 
Log Message:
next version


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1855
retrieving revision 1.1856
diff -u -r1.1855 -r1.1856
--- openoffice.org.spec	11 Mar 2009 09:34:04 -0000	1.1855
+++ openoffice.org.spec	12 Mar 2009 11:54:08 -0000	1.1856
@@ -1,6 +1,6 @@
 %define oootag OOO310
-%define ooomilestone 4
-%define rh_rpm_release 2
+%define ooomilestone 5
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -51,17 +51,7 @@
 Source7:        redhat-langpacks.tar.gz
 Source8:        redhat-agreement.xsl
 Source9:        openoffice.org-javafilter.desktop
-Source10:       http://www.puimula.org/htp/ooo/gsi/3.1/GSI_fi.sdf.gz
-Source11:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60508/or-IN_DEV300_m40.sdf
-Source12:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60507/mr-IN_DEV300_m40.sdf
-Source13:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60513/te-IN_DEV300_m40.sdf
-Source14:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60506/kn-IN_DEV300_m40.sdf
-Source15:       http://indian.googlecode.com/files/hi-IN-D300-m40.tar.gz
-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
+Source10:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60508/or-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
@@ -92,7 +82,9 @@
 Patch9:  openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
 Patch10: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
 Patch11: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+%if %{gtkprintui}
 Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+%endif
 Patch13: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
 Patch14: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
 Patch15: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
@@ -1571,7 +1563,9 @@
 %patch9  -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
 %patch10 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
 %patch11 -p1 -b .ooo65491.psprint.enablenups.patch
+%if %{gtkprintui}
 cat %{PATCH12} >> svtools/source/dialogs/localize.sdf
+%endif
 %patch13 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
 %patch14 -p0 -b .ooo68717.gstreamer.video.patch
 %patch15 -p1 -b .ooo63159.sal.dtype.patch
@@ -1696,40 +1690,9 @@
     build --dlv_switch -link --all
 fi
 deliver -link
-# i98704
-cp %{SOURCE10} .
-gzip -d GSI_fi.sdf.gz
-localize -m -x -l fi -f GSI_fi.sdf
 # i99658
-cp %{SOURCE11} .
+cp %{SOURCE10} .
 localize -m -x -l or-IN -f or-IN_DEV300_m40.sdf
-# i99667
-cp %{SOURCE12} .
-localize -m -x -l mr-IN -f mr-IN_DEV300_m40.sdf
-# i99673
-cp %{SOURCE13} .
-localize -m -x -l te-IN -f te-IN_DEV300_m40.sdf
-# i99659
-cp %{SOURCE14} .
-localize -m -x -l kn-IN -f kn-IN_DEV300_m40.sdf
-# i99657
-tar xzf %{SOURCE15}
-localize -m -x -l hi-IN -f hi-IN-D300-m40/hi-IN-300m40.sdf
-# i95786
-tar xzf %{SOURCE16}
-localize -m -x -l mai -f Maithili-mai-ooo3.0.sdf
-# i99699
-cp %{SOURCE17} .
-localize -m -x -l as-IN -f as-IN_DEV300_m40.sdf
-# 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 ../..
 
 pushd solver/%{OFFICEUPD}/unxlng*/bin
@@ -4135,6 +4098,21 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Mar 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-5.1
+- next version
+- disable gnome-print-unix dialog
+- drop integrated Maithili translations
+- drop integrated Finnish translations
+- drop integrated Hindi translations
+- drop integrated Punjabi translations
+- drop integrated Tamil translations
+- drop integrated Marathi translations
+- drop integrated Telugu translations
+- drop integrated Kannada translations
+- drop integrated Assamese translations
+- drop integrated Malayalam translations
+- drop integrated workspace.localization35.patch
+
 * Tue Mar 10 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.2
 - Resolves: rhbz#481012 workaround incorrect branch/type selection 
   or whatever it is with openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- sources	12 Mar 2009 11:32:07 -0000	1.354
+++ sources	12 Mar 2009 11:54:08 -0000	1.355
@@ -6,15 +6,5 @@
 d2392ab1e9049bc3e1d096c483f7a10c  redhat-registry.tar.gz
 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
-d826ee150349ee5fe4b43cdd7a130084  te-IN_DEV300_m40.sdf
-f457cdd91857701b1282bfffb0ec5e8a  kn-IN_DEV300_m40.sdf
-bdc3b2b8b90ac1879f216cfa3c50d7e1  hi-IN-D300-m40.tar.gz
-be8d6866609e7aa7282220c0f469b279  as-IN_DEV300_m40.sdf
-d185576d40f1157cc1d25e8f72d5017a  ml-IN_DEV300_m40.sdf
 b1802ed45f8244ebae351aec4285edd9  OOO310_m5.tar.bz2


--- workspace.localization35.patch DELETED ---