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

rpms/openoffice.org/devel openoffice.org-1.9.89.ooo51873.parallel.sysui.patch, NONE, 1.1 openoffice.org.spec, 1.297, 1.298 openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch, 1.1, NONE



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14957

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.89.ooo51873.parallel.sysui.patch 
Removed Files:
	openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch 
Log Message:
bring back stlport

openoffice.org-1.9.89.ooo51873.parallel.sysui.patch:
 desktop/share/makefile.mk       |    0 
 sysui/desktop/share/makefile.mk |    9 ++++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.89.ooo51873.parallel.sysui.patch ---
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	31 Mar 2005 21:30:56 -0000
@@ -111,7 +111,14 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) ..
 	@$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(COMMONMISC)$/$(TARGET)$/launcher_name.ulf
 	@$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(COMMONMISC)$/$(TARGET)$/launcher_comment.ulf
 .IF "$(WITH_LIBSN)"=="YES"
-	@$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))
+#	@$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))
+	@echo "StartupNotify=true" >> $(@:db).$(INPATH)/writer.desktop
+	@echo "StartupNotify=true" >> $(@:db).$(INPATH)/calc.desktop
+	@echo "StartupNotify=true" >> $(@:db).$(INPATH)/draw.desktop
+	@echo "StartupNotify=true" >> $(@:db).$(INPATH)/impress.desktop
+	@echo "StartupNotify=true" >> $(@:db).$(INPATH)/math.desktop
+	@echo "StartupNotify=true" >> $(@:db).$(INPATH)/base.desktop
+	@echo "StartupNotify=true" >> $(@:db).$(INPATH)/printeradmin.desktop
 .ENDIF
 	@mv -f $(@:db).$(INPATH)/* $(@:d)
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- openoffice.org.spec	12 Jul 2005 13:32:27 -0000	1.297
+++ openoffice.org.spec	13 Jul 2005 08:57:00 -0000	1.298
@@ -1,5 +1,5 @@
 %define ooo2ver 116
-%define ooo_rpm_release 3
+%define ooo_rpm_release 3.cmc
 %define build_fc4 0
 %define build_fc5 1
 
@@ -23,11 +23,12 @@
 
 %if %{build_fc4}
 %define release_extension .1.0.fc4
-%define systemxmlsec = --without-system-xmlsec
+%define extraflags = --without-system-xmlsec
 %endif
 %if %{build_fc5}
 %define release_extension .2.0.fc5
-%define systemxmlsec = --with-system-xmlsec
+#%define extraflags = --with-system-xmlsec --without-stlport4
+%define extraflags = --with-system-xmlsec
 %endif
 
 ExclusiveArch:  %{ix86} ppc
@@ -79,7 +80,7 @@
 Patch11: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
 Patch12: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
 Patch13: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-Patch14: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
+Patch14: openoffice.org-1.9.89.ooo51873.parallel.sysui.patch
 Patch15: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
 Patch16: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
 Patch17: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
@@ -116,7 +117,7 @@
 Patch48: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
 Patch49: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
 Patch50: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-Patch51: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+#Patch51: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 Patch52: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
 Patch53: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
 Patch54: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
@@ -721,7 +722,7 @@
 %patch11 -p1 -b .rh133741.alwaysgtk.patch
 %patch12 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
 %patch13 -p1 -b .ooo35627.parallel.cppumaker.patch
-%patch14 -p1 -b .oooXXXXX.parallel.sysui.patch
+%patch14 -p1 -b .ooo51873.parallel.sysui.patch
 %patch15 -p1 -b .ooo44027.pthreadchange.patch
 %patch16 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
 %patch17 -p1 -b .rh152269.nfs.desktop.patch
@@ -758,7 +759,7 @@
 %patch48 -p1 -b .rh161886.rpath.desktop.patch
 %patch49 -p1 -b .ooo51637.solenv.pyuno.patch
 %patch50 -p1 -b .ooo51638.mailmerge.patch
-%patch51 -p1 -b .oooXXXXX.nostlport.patch
+#%patch51 -p1 -b .oooXXXXX.nostlport.patch
 %patch52 -p1 -b .ooo51673.printing.checkerror.patch
 %patch53 -p1 -b .ooo51735.audio.withoutnas.patch
 %patch54 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
@@ -802,7 +803,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-stlport4 %{systemxmlsec} %{withlang}
+%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2179,8 +2180,10 @@
 %{instdir}/program/libxmlfd680*.so
 %if %{build_fc4}
 %{instdir}/program/libxmlsec*
+%{instdir}/program/libstlport*.so
 %else
 %{instdir}/program/libxmlsecurity.so
+%{instdir}/program/libstlport*.so
 %endif
 %{instdir}/program/libxmx680*.so
 %{instdir}/program/libxo680*.so
@@ -2951,6 +2954,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jul 13 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-3.cmc
+- lets continue to use stlport for fc4, because I have suspicions I don't
+  want to inflict on the stable branch
+
 * Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-3
 - enable evo addressbook in addressbook wizard
 - rh#162875# extra leading / from file picker


--- openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch DELETED ---


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