rpms/openoffice.org/devel openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch, 1.1, 1.2 openoffice.org.spec, 1.1498, 1.1499 workspace.ucpgio1.patch, 1.2, 1.3 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.1, NONE openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch, 1.1, NONE workspace.tl37.patch, 1.3, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri May 9 15:53:19 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22418
Modified Files:
openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
openoffice.org.spec workspace.ucpgio1.patch
Removed Files:
openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
workspace.tl37.patch
Log Message:
drop redundant foo
openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch:
Index: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch 30 Mar 2008 11:20:20 -0000 1.1
+++ openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch 9 May 2008 15:52:38 -0000 1.2
@@ -1,30 +1,3 @@
-Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
-retrieving revision 1.18
-diff -u -r1.18 makefile.mk
---- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 25 Mar 2008 16:49:16 -0000 1.18
-+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 30 Mar 2008 11:13:00 -0000
-@@ -104,16 +104,13 @@
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(LNGLIB) \
-- $(HNJLIB)
-+ $(HNJLIB) \
-+ $(ULINGULIB)
-
--.IF "$(SYSTEM_HUNSPELL)" != "YES"
--SHL1STDLIBS+= $(ULINGULIB)
--.ELSE
-+.IF "$(SYSTEM_HUNSPELL)" == "YES"
- SHL1STDLIBS+= $(HUNSPELL_LIBS)
- .ENDIF
-
--
--
- # build DLL
- SHL1LIBS= $(SLB)$/$(TARGET).lib
- SHL1IMPLIB= i$(TARGET)
Index: source/lingutil/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/makefile.mk,v
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1498
retrieving revision 1.1499
diff -u -r1.1498 -r1.1499
--- openoffice.org.spec 9 May 2008 07:43:19 -0000 1.1498
+++ openoffice.org.spec 9 May 2008 15:52:38 -0000 1.1499
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 11
+%define ooomilestone 12
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -95,47 +95,44 @@
Patch22: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
Patch23: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
Patch24: openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
-Patch25: workspace.tl37.patch
-Patch26: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch27: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch28: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch29: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch30: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch31: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch32: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch33: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch34: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch35: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch36: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch37: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch38: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch39: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch40: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch41: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch42: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch43: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch44: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch45: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch46: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch47: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch48: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch49: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch50: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch51: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch52: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch53: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch54: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch55: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch56: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch57: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch58: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch59: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch60: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch61: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch62: workspace.ucpgio1.patch
-Patch63: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch64: openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
-Patch65: openoffice.org-3.0.0.ooo89172.filter.string.patch
+Patch25: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch26: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch27: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch28: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch29: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch30: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch31: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch32: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch33: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch34: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch35: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch36: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch37: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch38: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch39: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch40: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch41: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch42: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch43: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch44: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch45: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch46: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch47: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch48: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch49: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch50: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch51: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch52: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch53: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch54: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch55: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch56: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch57: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch58: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch59: workspace.ucpgio1.patch
+Patch60: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch61: openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
+Patch62: openoffice.org-3.0.0.ooo89172.filter.string.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1223,47 +1220,44 @@
%patch22 -p1 -b .ooo65491.psprint.enablenups.patch
cat %{PATCH23} >> svtools/source/dialogs/localize.sdf
%patch24 -p1 -b .ooo87882.lingucomponent.systemdicts.patch
-%patch25 -p1 -b .tl37.patch
-%patch26 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch27 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch28 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch29 -p0 -b .ooo68717.gstreamer.video.patch
-%patch30 -p1 -b .ooo63159.sal.dtype.patch
-%patch31 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch32 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch33 -p1 -b .ooo80816.selinux.bridges.patch
-%patch34 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch35 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH36}
-%patch37 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch38 -p1 -b .ooo76649.httpencoding.patch
-%patch39 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch40 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch41 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch42 -p1 -b .ooo85097.desktop.pagein.patch
-%patch43 -p1
-%patch44 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch45 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch46 -p1 -b .ooo85448.emptyrpath.patch
-%patch47 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch48 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch49 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch50 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch51 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch52 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch53 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch54 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch55 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch56 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch57 -p1 -b .ooo87991.fpickersafe.patch
-%patch58 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch59 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch60 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch61 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch62 -p1 -b .workspace.ucpgio1.patch
-%patch63 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch64 -p1 -b .ooo88584.sdext.extraqual.patch
-%patch65 -p1 -b .ooo89172.filter.string.patch
+%patch25 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch26 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch27 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch28 -p0 -b .ooo68717.gstreamer.video.patch
+%patch29 -p1 -b .ooo63159.sal.dtype.patch
+%patch30 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch31 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch32 -p1 -b .ooo80816.selinux.bridges.patch
+%patch33 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch34 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH35}
+%patch36 -p1 -b .ooo76649.httpencoding.patch
+%patch37 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch38 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch39 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch40 -p1 -b .ooo85097.desktop.pagein.patch
+%patch41 -p1
+%patch42 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch43 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch44 -p1 -b .ooo85448.emptyrpath.patch
+%patch45 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch46 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch47 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch48 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch49 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch50 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch51 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch52 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch53 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch54 -p1 -b .ooo87991.fpickersafe.patch
+%patch55 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch56 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch57 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch58 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch59 -p1 -b .workspace.ucpgio1.patch
+%patch60 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch61 -p1 -b .ooo88584.sdext.extraqual.patch
+%patch62 -p1 -b .ooo89172.filter.string.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3383,6 +3377,9 @@
%{python_py_sitearch}/unohelper.py*
%changelog
+* Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.1
+- next version
+
* Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
- next version
- drop integrated workspace.cmcfixes43.patch
workspace.ucpgio1.patch:
Index: workspace.ucpgio1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.ucpgio1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.ucpgio1.patch 1 May 2008 16:29:13 -0000 1.2
+++ workspace.ucpgio1.patch 9 May 2008 15:52:38 -0000 1.3
@@ -56,54 +56,33 @@
diff -u installation/scp2/source/gnome/file_gnome.scp:1.7 installation/scp2/source/gnome/file_gnome.scp:1.7.32.2
--- installation/scp2/source/gnome/file_gnome.scp:1.7 Tue Apr 15 03:42:09 2008
+++ installation/scp2/source/gnome/file_gnome.scp Wed Apr 30 09:54:49 2008
-@@ -29,22 +29,26 @@
+@@ -29,6 +29,18 @@
************************************************************************/
#include "macros.inc"
--File gid_File_Lib_Gnomevfs
+#ifdef ENABLE_GIO
+File gid_File_Lib_GIO
- TXT_FILE_BODY;
-- Styles = (PACKED);
++ TXT_FILE_BODY;
+ Styles = (PACKED,PATCH);
- Dir = gid_Dir_Program;
-- Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
++ Dir = gid_Dir_Program;
+ Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
- RegistryID = gid_Starregistry_Services_Rdb;
-- Regmergefile = "ucpgvfs-ucd.txt";
++ RegistryID = gid_Starregistry_Services_Rdb;
+ Regmergefile = "ucpgio-ucd.txt";
- End
++End
+#endif
-
--File gid_File_Lib_Gconfbe
-+#ifdef ENABLE_GNOMEVFS
+
-+File gid_File_Lib_Gnomevfs
++#ifdef ENABLE_GNOMEVFS
+ File gid_File_Lib_Gnomevfs
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
-- Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
-+ Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
+@@ -37,6 +49,7 @@
RegistryID = gid_Starregistry_Services_Rdb;
-- Regmergefile = "gconfbe1-ucd.txt";
-+ Regmergefile = "ucpgvfs-ucd.txt";
- End
-
- File gid_File_Bin_Gnome_Set_Default_Application
-@@ -54,3 +58,13 @@
- Styles = (PACKED);
+ Regmergefile = "ucpgvfs-ucd.txt";
End
-
+#endif
-+
-+File gid_File_Lib_Gconfbe
-+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Dir_Program;
-+ Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
-+ RegistryID = gid_Starregistry_Services_Rdb;
-+ Regmergefile = "gconfbe1-ucd.txt";
-+End
+
+ File gid_File_Lib_Gconfbe
+ TXT_FILE_BODY;
Index: installation/scp2/source/gnome/makefile.mk
diff -u installation/scp2/source/gnome/makefile.mk:1.6 installation/scp2/source/gnome/makefile.mk:1.6.34.1
--- installation/scp2/source/gnome/makefile.mk:1.6 Thu Apr 10 02:19:01 2008
@@ -143,21 +122,21 @@
Module gid_Module_Optional_Gnome
ParentID = gid_Module_Optional;
Default = YES;
-@@ -37,6 +44,13 @@
+@@ -37,6 +44,12 @@
MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
Styles = (DONTSHOWINUSERINSTALL);
XpdCheckSolaris = "SUNWgnome-vfs";
-- Files = (gid_File_Lib_Gnomevfs, gid_File_Lib_Gconfbe, gid_File_Bin_Gnome_Set_Default_Application);
+- Files = (gid_File_Lib_Gnomevfs, gid_File_Lib_Gconfbe);
+ Files = (
+#ifdef ENABLE_GNOMEVFS
-+ gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
++ gid_File_Lib_Gnomevfs,
+#endif
+#ifdef ENABLE_GIO
+ gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu
+#endif
+ gid_File_Lib_Gconfbe);
End
-
+-
Index: installation/scp2/source/ooo/directory_ooo.scp
diff -u installation/scp2/source/ooo/directory_ooo.scp:1.47 installation/scp2/source/ooo/directory_ooo.scp:1.47.30.1
--- installation/scp2/source/ooo/directory_ooo.scp:1.47 Tue Apr 15 07:48:48 2008
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch DELETED ---
--- openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch DELETED ---
--- workspace.tl37.patch DELETED ---
More information about the fedora-extras-commits
mailing list