[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.97.rh156067.noversionedsysui.patch, NONE, 1.1 openoffice.org.spec, 1.1178, 1.1179 openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch, 1.4, NONE openoffice.org-1.9.97.rh156067.noversionedicons.patch, 1.3, NONE



Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21294

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.97.rh156067.noversionedsysui.patch 
Removed Files:
	openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch 
	openoffice.org-1.9.97.rh156067.noversionedicons.patch 
Log Message:
sysui integration stuff has changed

openoffice.org-1.9.97.rh156067.noversionedsysui.patch:

--- NEW FILE openoffice.org-1.9.97.rh156067.noversionedsysui.patch ---
Index: desktop/productversion.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/productversion.mk,v
retrieving revision 1.18.2.2
diff -u -r1.18.2.2 productversion.mk
--- openoffice.org.orig/sysui/desktop/productversion.mk	8 May 2007 11:35:10 -0000	1.18.2.2
+++ openoffice.org/sysui/desktop/productversion.mk	18 May 2007 17:58:28 -0000
@@ -67,7 +67,7 @@
 PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
 PKGVERSION.openoffice.org = $(PKGVERSION)
-UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org)
+UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)
 ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
 
 PRODUCTNAME.broffice.org = BrOffice.org
 PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)
Index: desktop/share/makefile.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/share/makefile.mk,v
retrieving revision 1.3
diff -u -p -r1.3 makefile.mk
--- openoffice.org.orig/sysui/desktop/share/makefile.mk	21 Jan 2005 11:19:32 -0000	1.3
+++ openoffice.org/sysui/desktop/share/makefile.mk	27 Apr 2005 10:11:04 -0000
@@ -144,9 +144,9 @@
 	@$(MKDIRHIER) $(@:db).$(INPATH)
 	@echo Creating desktop entries for $(@:f) ..
 	@echo ---------------------------------
-	@$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u '$${{UNIXPRODUCTNAME}}$${{PRODUCTVERSION}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH)
-	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
-	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+	@$(PERL) brand.pl -p '$${{PRODUCTNAME}}' -u '$${{UNIXPRODUCTNAME}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH)
+	@$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+	@$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
 .IF "$(WITH_LIBSN)"=="YES"
 	@$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))
 .ENDIF


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1178
retrieving revision 1.1179
diff -u -r1.1178 -r1.1179
--- openoffice.org.spec	19 May 2007 12:09:35 -0000	1.1178
+++ openoffice.org.spec	19 May 2007 16:10:07 -0000	1.1179
@@ -25,7 +25,7 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-ExclusiveArch:  %ix86 x86_64 ppc
+ExcludeArch:    ppc64
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.1
@@ -67,7 +67,7 @@
 Patch10: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
 Patch12: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
-Patch13: openoffice.org-1.9.97.rh156067.noversionedicons.patch
+Patch13: openoffice.org-1.9.97.rh156067.noversionedsysui.patch
 Patch14: openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
 %if %{gtkprintui}
 Patch15: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
@@ -75,61 +75,60 @@
 Patch16: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 Patch17: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
 Patch18: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch19: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch20: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch21: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
-Patch22: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch23: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch24: workspace.libxslt02.patch
-Patch25: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch26: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch27: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch28: workspace.fpicker6.patch
-Patch29: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch30: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch31: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch32: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch33: ooobuild.VBAObjects.patch
-Patch34: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch35: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch36: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch37: pseudoworkspace.valgrind1.patch
-Patch38: workspace.thbpp6.patch
-Patch39: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch40: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch41: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch42: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch43: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch44: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch45: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch46: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch47: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch48: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch49: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch50: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
-Patch51: workspace.tl37.patch
-Patch52: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch53: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch54: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch55: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch56: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch57: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch58: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch59: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch60: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch61: workspace.configrefactor01.patch
-Patch62: workspace.sixtyfour11.patch
-Patch63: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch64: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch65: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch66: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch67: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch68: openoffice.org-2.2.0.rh232389.tango.patch
-Patch69: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch70: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch71: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch72: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
-Patch73: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch19: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch20: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
+Patch21: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch22: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch23: workspace.libxslt02.patch
+Patch24: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch25: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch27: workspace.fpicker6.patch
+Patch28: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch29: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch30: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch31: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch32: ooobuild.VBAObjects.patch
+Patch33: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch34: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch35: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch36: pseudoworkspace.valgrind1.patch
+Patch37: workspace.thbpp6.patch
+Patch38: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch39: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch40: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch41: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch42: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch43: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch44: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch45: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch46: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch47: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch48: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch49: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
+Patch50: workspace.tl37.patch
+Patch51: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch52: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+Patch53: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch54: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+Patch55: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch56: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch57: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch58: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+Patch59: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
+Patch60: workspace.configrefactor01.patch
+Patch61: workspace.sixtyfour11.patch
+Patch62: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch63: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch64: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch65: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+Patch66: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+Patch67: openoffice.org-2.2.0.rh232389.tango.patch
+Patch68: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch69: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch70: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch71: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
+Patch72: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -996,7 +995,7 @@
 %patch10 -p1 -b .rh161886.rpath.desktop.patch
 %patch11 -p1 -b .rh151357.setlangtolocale.patch
 %patch12 -p1 -b .rh151356.usetwodotzeropath.patch
-%patch13 -p1 -b .rh156067.noversionedicons.patch
+%patch13 -p1 -b .rh156067.noversionedsysui.patch
 %patch14 -p1
 %if %{gtkprintui}
 %patch15 -p1 -b .rh127576.gtkunixprintdialog.patch
@@ -1004,63 +1003,62 @@
 %patch16 -p1 -b .rh156677.cripplemenus.sysui.patch
 %patch17 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
 %patch18 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch19 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch20 -p1 -b .ooo54603.fontconfig.patch
-%patch21 -p1 -b .ooo51931.fixxmlsec.patch
-%patch22 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%patch23 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch24 -p1 -b .workspace.libxslt02.patch
-%patch25 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch26 -p1
-%patch27 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch28 -p1 -b .workspace.fpicker6.patch
-%patch29 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch30 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch31 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch32 -p1 -b .rh187919.gtkunderkde.patch
-%patch33 -p0 -b .ooobuild.VBAObjects.patch
-%patch34 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch35 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch36 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch37 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch38 -p1 -b .workspace.thbpp6.patch
-%patch39 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch40 -p1 -b .rh217065.syncbackspace.patch
-%patch41 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch42 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch43 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch44 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH45} >> svtools/source/dialogs/localize.sdf
-%patch46  -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch47 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch48 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch49 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch50 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch51 -p1 -b .tl37.patch
-%patch52 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch53 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch54 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch55 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch56 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch57 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch58 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch59 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch60 -p1 -b .ooo74401.basctl.boost.patch
-%patch61 -p1 -b .workspace.configrefactor01.patch
-%patch62 -p1 -b .workspace.sixtyfour11.patch
-%patch63 -p1 -b .ooo68717.gstreamer.video.patch
-%patch64 -p1 -b .ooo63159.sal.dtype.patch
-%patch65 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch66 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch67 -p1 -b .ooo75329.xdguserdir.patch
-%patch68 -p1 -b .rh232389.tango.patch
+%patch19 -p1 -b .ooo54603.fontconfig.patch
+%patch20 -p1 -b .ooo51931.fixxmlsec.patch
+%patch21 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch22 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch23 -p1 -b .workspace.libxslt02.patch
+%patch24 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch25 -p1
+%patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch27 -p1 -b .workspace.fpicker6.patch
+%patch28 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch29 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch30 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch31 -p1 -b .rh187919.gtkunderkde.patch
+%patch32 -p0 -b .ooobuild.VBAObjects.patch
+%patch33 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch34 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch35 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch36 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch37 -p1 -b .workspace.thbpp6.patch
+%patch38 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch39 -p1 -b .rh217065.syncbackspace.patch
+%patch40 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch41 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch42 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch43 -p1 -b .ooo61812.svx.a11ycrash.patch
+cat %{PATCH44} >> svtools/source/dialogs/localize.sdf
+%patch45 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch46 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch47 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch48 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch49 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch50 -p1 -b .tl37.patch
+%patch51 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch52 -p1 -b .ooo73481.svx.longnotint32.patch
+%patch53 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch54 -p1 -b .ooo73866.javaunohelper.parallel.patch
+%patch55 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch56 -p1 -b .ooo73974.bridges.doublereturn.patch
+%patch57 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch58 -p1 -b .ooo74451.sw.typemismatch.patch
+%patch59 -p1 -b .ooo74401.basctl.boost.patch
+%patch60 -p1 -b .workspace.configrefactor01.patch
+%patch61 -p1 -b .workspace.sixtyfour11.patch
+%patch62 -p1 -b .ooo68717.gstreamer.video.patch
+%patch63 -p1 -b .ooo63159.sal.dtype.patch
+%patch64 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch65 -p1 -b .ooo75190.shell.newrecentlyused.patch
+%patch66 -p1 -b .ooo75329.xdguserdir.patch
+%patch67 -p1 -b .rh232389.tango.patch
 %if %{linkopt}
-%patch69 -p1 -b .ooo53397.linkopt.patch
+%patch68 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch70 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch71 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch72 -p1 -b .oooXXXXX.shell.reduceglobals.patch
-%patch73 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch69 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch70 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch71 -p1 -b .oooXXXXX.shell.reduceglobals.patch
+%patch72 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -1115,16 +1113,16 @@
     build --dlv_switch -link --all
 fi
 
-#make no rpms in sysui for menus, but do generate the icons
-cd ../../sysui
-export RPM=true
-export PKGFORMAT=rpm
-build
-deliver -link
-unset PKGFORMAT
+#generate the icons and mime type stuff
+cd ../../sysui/unxlng*/misc/openoffice.org
+export DESTDIR=../../../output
+export KDEMAINDIR=/usr
+export GNOMEDIR=/usr
+export GNOME_MIME_THEME=hicolor
+./create_tree.sh
 
 #start of jakub based suggestion on prelink optimization 
-cd ../desktop/source/app
+cd ../../../../desktop/source/app
 %if ! %{linkopt}
 sed -i -e "s/OBJ/SLO/" makefile.mk
 dmake
@@ -1437,12 +1435,11 @@
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
 #get rid of the gnome icons
-rm -rf sysui/unxlng*/misc/redhat/usr/share/icons/gnome
+rm -rf sysui/output/usr/share/icons/gnome
 #relocate the rest of them
-cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
-rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application.flag
+cp -r sysui/output/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
+cp -r sysui/output/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
+cp -r sysui/output/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
 
 rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes
 rm -rf $RPM_BUILD_ROOT/%{instdir}/licenses


--- openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch DELETED ---


--- openoffice.org-1.9.97.rh156067.noversionedicons.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]