rpms/openoffice.org/devel .cvsignore, 1.201, 1.202 openoffice.org.spec, 1.1829, 1.1830 sources, 1.340, 1.341 workspace.fwk103.patch, 1.1, 1.2 openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Thu Feb 26 14:02:08 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9692
Modified Files:
.cvsignore openoffice.org.spec sources workspace.fwk103.patch
Removed Files:
openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
Log Message:
Resolves: rhbz#487504 / ooo#99658 Oriya translations
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- .cvsignore 26 Feb 2009 09:39:59 -0000 1.201
+++ .cvsignore 26 Feb 2009 14:01:38 -0000 1.202
@@ -8,3 +8,4 @@
openoffice.org-javafilter.desktop
GSI_fi.sdf.gz
OOO310_m3.tar.bz2
+or-IN_DEV300_m40.sdf
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1829
retrieving revision 1.1830
diff -u -r1.1829 -r1.1830
--- openoffice.org.spec 26 Feb 2009 09:43:29 -0000 1.1829
+++ openoffice.org.spec 26 Feb 2009 14:01:38 -0000 1.1830
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 3
-%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}
@@ -52,6 +52,7 @@
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
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
@@ -114,21 +115,20 @@
Patch41: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch42: workspace.fwk103.patch
Patch43: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
-Patch44: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
-Patch45: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch46: workspace.gfbcrash.patch
-Patch47: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch48: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch49: workspace.ooo31gsl2.patch
-Patch50: workspace.vcl100.patch
-Patch51: workspace.xmergeclean.patch
-Patch52: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch53: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
-Patch54: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
-Patch55: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
-Patch56: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch57: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch
-Patch58: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch44: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
+Patch45: workspace.gfbcrash.patch
+Patch46: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch47: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch48: workspace.ooo31gsl2.patch
+Patch49: workspace.vcl100.patch
+Patch50: workspace.xmergeclean.patch
+Patch51: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+Patch52: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
+Patch53: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
+Patch54: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
+Patch55: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch56: openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch
+Patch57: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1577,21 +1577,20 @@
%patch41 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch42 -p1 -b .workspace.fwk103.patch
%patch43 -p1 -b .ooo98885.sw.safeindex.patch
-%patch44 -p1 -b .ooo98909.sfx2.missingplugins.patch
-%patch45 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch46 -p0 -b .workspace.gfbcrash.patch
-%patch47 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch48 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch49 -p0 -b .workspace.ooo31gsl2.patch
-%patch50 -p0 -b .workspace.vcl100.patch
-%patch51 -p0 -b .workspace.xmergeclean.patch
-%patch52 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch53 -p0 -b .ooo99427.sd.ensure-icons-state.patch
-%patch54 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch55 -p0 -b .ooo99529.sw.notrailingnewline.patch
-%patch56 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch57 -p0 -b .ooo98465.sw.fix-doctables.patch
-%patch58 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch44 -p1 -R -b .ooo99050.sw.htmlload.patch
+%patch45 -p0 -b .workspace.gfbcrash.patch
+%patch46 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch47 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch48 -p0 -b .workspace.ooo31gsl2.patch
+%patch49 -p0 -b .workspace.vcl100.patch
+%patch50 -p0 -b .workspace.xmergeclean.patch
+%patch51 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
+%patch52 -p0 -b .ooo99427.sd.ensure-icons-state.patch
+%patch53 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
+%patch54 -p0 -b .ooo99529.sw.notrailingnewline.patch
+%patch55 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch56 -p0 -b .ooo98465.sw.fix-doctables.patch
+%patch57 -p1 -b .oooXXXXX.solenv.allowmissing.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1659,15 +1658,18 @@
#build translation tools and apply extra translations, so
#this can be removed when these translations are upstreamed
-#e.g. i98704
cd transex3/prj
if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
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} .
+localize -m -x -l or-IN -f or-IN_DEV300_m40.sdf
cd ../..
#build OOo, on failure make a stab at debugging the crash if any, and
@@ -4089,6 +4091,11 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Thu Feb 26 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-3.2
+- Resolves: rhbz#487504 / ooo#99658 Oriya translations
+- openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch merged
+ into workspace.fwk103
+
* Thu Feb 26 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-3.1
- next version
- replace openoffice.org-1.9.87.rh151357.setlangtolocale.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- sources 26 Feb 2009 09:39:59 -0000 1.340
+++ sources 26 Feb 2009 14:01:38 -0000 1.341
@@ -8,3 +8,4 @@
4223939ea412f97ccde9fadbcc0430b6 openoffice.org-javafilter.desktop
eaf47e2e3d3586f6156c61379cc34df9 redhat-langpacks.tar.gz
f4d811bf2c10fadf34b68805697e2b72 OOO310_m3.tar.bz2
+7d7eb194a61b3b1c59e3c82da889ac27 or-IN_DEV300_m40.sdf
workspace.fwk103.patch:
Index: workspace.fwk103.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fwk103.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.fwk103.patch 24 Feb 2009 15:06:15 -0000 1.1
+++ workspace.fwk103.patch 26 Feb 2009 14:01:38 -0000 1.2
@@ -22,3 +22,19 @@
return xAccCfg;
}
+Index: source/doc/plugin.cxx
+===================================================================
+RCS file: /cvs/framework/sfx2/source/doc/plugin.cxx,v
+retrieving revision 1.7
+diff -u -r1.7 plugin.cxx
+--- openoffice.org.orig/sfx2/source/doc/plugin.cxx 11 Apr 2008 13:11:48 -0000 1.7
++++ openoffice.org/sfx/source/doc/plugin.cxx 5 Feb 2009 16:12:28 -0000
+@@ -161,7 +161,7 @@
+ // we must destroy the plugin before the parent is destroyed
+ xWindow->addEventListener( this );
+ xFrame->setComponent( xWindow, uno::Reference < frame::XController >() );
+- return TRUE;
++ return mxPlugin.is() ? TRUE : FALSE;
+ }
+
+ return FALSE;
--- openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch DELETED ---
More information about the scm-commits
mailing list