rpms/openoffice.org/devel .cvsignore, 1.174, 1.175 openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.5, 1.6 openoffice.org.spec, 1.1558, 1.1559 sources, 1.299, 1.300 workspace.ab55.patch, 1.1, 1.2 openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch, 1.2, NONE openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch, 1.1, NONE openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch, 1.1, NONE openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Sun Jul 6 19:16:42 UTC 2008
- Previous message (by thread): rpms/seamonkey/F-9 firefox-1.5-bullet-bill.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 seamonkey.spec, 1.44, 1.45 sources, 1.19, 1.20
- Next message (by thread): rpms/jd/F-9 .cvsignore, 1.260, 1.261 jd.spec, 1.297, 1.298 sources, 1.261, 1.262
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300
Modified Files:
.cvsignore openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
openoffice.org.spec sources workspace.ab55.patch
Removed Files:
openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch
Log Message:
close enough
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- .cvsignore 1 Jul 2008 15:08:48 -0000 1.174
+++ .cvsignore 6 Jul 2008 19:15:50 -0000 1.175
@@ -6,4 +6,4 @@
redhat-langpacks.tar.gz
evolocal.odb
bengali.sdf
-DEV300_m22.tar.bz2
+DEV300_m23.tar.bz2
openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch:
Index: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 1 May 2008 15:54:05 -0000 1.5
+++ openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 6 Jul 2008 19:15:50 -0000 1.6
@@ -279,14 +279,14 @@
diff -ru sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
--- openoffice.org.orig/sc/source/filter/excel/xipivot.cxx 2008-05-01 14:06:26.000000000 +0100
+++ openoffice.org/sc/source/filter/excel/xipivot.cxx 2008-05-01 14:07:19.000000000 +0100
-@@ -695,7 +695,6 @@
- String aDummyName = CREATE_STRING( "DPCache" );
- if( maTabName.Len() > 0 )
- aDummyName.Append( '_' ).Append( maTabName );
-- ScfTools::ConvertToScSheetName( aDummyName );
- rDoc.CreateValidTabName( aDummyName );
- rDoc.RenameTab( nScTab, aDummyName );
- // set sheet index to source range
+@@ -701,7 +701,6 @@
+ String aDummyName = CREATE_STRING( "DPCache" );
+ if( maTabName.Len() > 0 )
+ aDummyName.Append( '_' ).Append( maTabName );
+- ScfTools::ConvertToScSheetName( aDummyName );
+ rDoc.CreateValidTabName( aDummyName );
+ rDoc.RenameTab( nScTab, aDummyName );
+ // set sheet index to source range
diff -ru sc/source/filter/ftools/ftools.cxx sc/source/filter/ftools/ftools.cxx
--- openoffice.org.orig/sc/source/filter/ftools/ftools.cxx 2008-05-01 14:06:25.000000000 +0100
+++ openoffice.org/sc/source/filter/ftools/ftools.cxx 2008-05-01 14:07:19.000000000 +0100
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1558
retrieving revision 1.1559
diff -u -r1.1558 -r1.1559
--- openoffice.org.spec 6 Jul 2008 13:47:37 -0000 1.1558
+++ openoffice.org.spec 6 Jul 2008 19:15:50 -0000 1.1559
@@ -1,6 +1,6 @@
%define oootag DEV300
-%define ooomilestone 22
-%define rh_rpm_release 2
+%define ooomilestone 23
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -99,29 +99,25 @@
Patch29: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
Patch30: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
Patch31: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch32: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch33: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch34: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch35: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch36: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch37: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch38: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch39: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch40: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-Patch41: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
-Patch42: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch43: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-Patch44: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-Patch45: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-Patch46: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
-Patch47: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
-Patch48: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch49: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
-Patch50: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch51: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
-Patch52: workspace.cairo06.patch
-Patch53: workspace.ab55.patch
-Patch54: openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch
+Patch32: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch33: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch34: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch35: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch36: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch37: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch38: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch39: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
+Patch40: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
+Patch41: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch42: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
+Patch43: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
+Patch44: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch45: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
+Patch46: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch47: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+Patch48: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
+Patch49: workspace.cairo06.patch
+Patch50: workspace.ab55.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1220,7 +1216,7 @@
%prep
%setup -q -n %{ooo_base_name}
-cp -p %{SOURCE1} extras/source/database/evolocal.odb
+#Customize Palette to remove Sun colours and add Red Hat colours
(sed -e '/Sun/d' extras/source/palettes/standard.soc | head -n -1 && \
echo -e ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
<draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
@@ -1229,6 +1225,7 @@
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
+cp -p %{SOURCE1} extras/source/database/evolocal.odb
cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
%patch2 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
@@ -1262,29 +1259,25 @@
%patch29 -p1 -b .ooo85448.emptyrpath.patch
%patch30 -p1 -b .ooo85921.sd.editmasterundermouse.patch
%patch31 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch32 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch33 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch34 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch35 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch36 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch37 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch38 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch39 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch40 -p1 -b .ooo90055.swext.allowadmin.patch
-%patch41 -p1 -b .oooXXXXX.odk.3layer.patch
-%patch42 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch43 -p1 -b .ooo90178.tools.fixmacro.patch
-%patch44 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
-%patch45 -p1 -b .ooo82545.np_sdk.x86_64.patch
-%patch46 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
-%patch47 -p1 -b .ooo90306.sw.wrongprotection.patch
-%patch48 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch49 -p1 -b .ooo90697.sd.a11ycrash.patch
-%patch50 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch51 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
-%patch52 -p1 -b .workspace.cairo06.patch
-%patch53 -p1 -b .workspace.ab55.patch
-%patch54 -p1 -b .rhXXXXXX.forms.qa.patch
+%patch32 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch33 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch34 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch35 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch36 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch37 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch38 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch39 -p1 -b .ooo90055.swext.allowadmin.patch
+%patch40 -p1 -b .oooXXXXX.odk.3layer.patch
+%patch41 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch42 -p1 -b .ooo90178.tools.fixmacro.patch
+%patch43 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
+%patch44 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch45 -p1 -b .ooo90306.sw.wrongprotection.patch
+%patch46 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch47 -p1 -b .ooo90876.connectivity.evoab2.patch
+%patch48 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
+%patch49 -p1 -b .workspace.cairo06.patch
+%patch50 -p1 -b .workspace.ab55.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1296,9 +1289,9 @@
%configure \
--with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
--with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm \
- --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-Xaw \
- --disable-gnome-vfs --enable-gio --enable-gstreamer --enable-symbols \
- --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba \
+ --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs \
+ --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown \
+ --enable-evolution2 --enable-cairo --enable-vba \
--with-vba-package-format="builtin" --enable-dbus --with-system-libs \
--with-system-headers --with-system-apache-commons \
--with-commons-logging-jar=/usr/share/java/commons-logging.jar \
@@ -3583,9 +3576,12 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Sat Jul 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-2
+* Sun Jul 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-1
+- next version
- split out arcane ScriptProviders out of core into optional extensions
=> bsh now only required by beanshell ScriptProvider
+- drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
+- drop integrated openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
* Tue Jul 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-1
- next version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- sources 1 Jul 2008 15:08:48 -0000 1.299
+++ sources 6 Jul 2008 19:15:50 -0000 1.300
@@ -6,4 +6,4 @@
261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz
16cb79cb018c6311e9797e85bd2461b2 evolocal.odb
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-dbdbeea8d85c8aaaae89f41c9094e513 DEV300_m22.tar.bz2
+faaec17320265bf4e5b5566defb30162 DEV300_m23.tar.bz2
workspace.ab55.patch:
Index: workspace.ab55.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.ab55.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.ab55.patch 3 Jul 2008 13:32:07 -0000 1.1
+++ workspace.ab55.patch 6 Jul 2008 19:15:50 -0000 1.2
@@ -65,8 +65,8 @@
{
BIG_SVX TRUE
BMP_WRITES_FLAG TRUE
-- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF
-+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE
+- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF REDLAND
++ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF REDLAND LUCENE
RES_ENUS TRUE
RES_GER TRUE
NO_REC_RES TRUE
@@ -122,8 +122,8 @@
--- util/xmlhelp/prj/build.lst:1.17 Tue Jun 24 09:17:30 2008
+++ util/xmlhelp/prj/build.lst Wed Jul 2 06:12:01 2008
@@ -1,4 +1,4 @@
--xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene NULL
-+xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene NULL
+-xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene unotools NULL
++xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene unotools NULL
xh xmlhelp usr1 - all xh_mkout NULL
xh xmlhelp\inc nmake - all xh_inc NULL
xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL
--- openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch DELETED ---
--- openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch DELETED ---
--- openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch DELETED ---
--- openoffice.org-3.0.0.rhXXXXXX.forms.qa.patch DELETED ---
- Previous message (by thread): rpms/seamonkey/F-9 firefox-1.5-bullet-bill.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 seamonkey.spec, 1.44, 1.45 sources, 1.19, 1.20
- Next message (by thread): rpms/jd/F-9 .cvsignore, 1.260, 1.261 jd.spec, 1.297, 1.298 sources, 1.261, 1.262
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list