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

rpms/openoffice.org/devel openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch, NONE, 1.1 openoffice.org.spec, 1.224, 1.225



Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch 
Log Message:
respin with nifty stuff

openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch:
 pyuno/source/module/makefile.mk |   21 +++++++++------------
 source/module/makefile.mk       |    0 
 2 files changed, 9 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch ---
Index: source/module/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/source/module/makefile.mk,v
retrieving revision 1.9
diff -u -p -r1.9 makefile.mk
--- openoffice.org.orig/pyuno/source/module/makefile.mk	16 Feb 2005 16:45:24 -0000	1.9
+++ openoffice.org/pyuno/source/module/makefile.mk	13 Jun 2005 19:54:33 -0000
@@ -104,13 +104,6 @@ SLOFILES= \
 		$(SLO)$/pyuno_adapter.obj	\
 		$(SLO)$/pyuno_gc.obj
 
-# remove this, when issue i35064 is integrated
-.IF "$(COM)"=="GCC"
-NOOPTFILES= \
-	$(SLO)$/pyuno_module.obj
-.ENDIF			# "$(COM)"=="GCC"
-
-
 SHL1STDLIBS= \
 		$(CPPULIB)		\
 		$(CPPUHELPERLIB)	\
@@ -145,16 +138,20 @@ $(DLLDEST)$/%.py: %.py
 .IF "$(GUI)" == "UNX"
 $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
 .IF "$(OS)" == "LINUX"
-	$(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "SOLARIS"
-	ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "FREEBSD"
-	ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "NETBSD"
-	$(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ELIF "$(OS)" == "MACOSX"
-	$(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o
+	@+ echo $(CC) -dynamiclib -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+.ELSE
+	@+ echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
 .ENDIF
+	cat $(MISC)$/$(@:b).cmd
+	@source $(MISC)$/$(@:b).cmd
 .ENDIF
 
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- openoffice.org.spec	13 Jun 2005 15:26:34 -0000	1.224
+++ openoffice.org.spec	13 Jun 2005 20:54:54 -0000	1.225
@@ -1,5 +1,5 @@
 %define ooo2ver 109
-%define ooo_rpm_release 2
+%define ooo_rpm_release 3
 %define build_fc4 0
 %define build_fc5 1
 
@@ -10,10 +10,8 @@
 %else
 %define langpack_langs en-US
 %endif
-#undef to try and compile with gcc3 and gcj4
 %define gccver 3.4.3
 %define gcjver 4.0.0
-%define _unpackaged_files_terminate_build 0
 
 # Disable internal dependency generator while we include libxmlsec1 and
 # other similiar duplicate/conflicting libs rh#156039#
@@ -102,6 +100,7 @@
 Patch42: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
 Patch43: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
 Patch44: workspace.gslpatches2.patch
+Patch45: openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -707,6 +706,7 @@
 %patch42 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
 %patch43 -p1 -b .ooo47323.binfilter.stupiddetect.patch
 %patch44 -p1 -b .workspace.gslpatches2.patch
+%patch45 -p1 -b .oooXXXXX.pyuno.pushrpath.patch
 
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
@@ -760,10 +760,11 @@
 if [ $MAXBUILDS -lt 2 ]; then
 	export MAXBUILDS=2
 fi
-#dance of the seven veils to get unpackaged install
+#make no rpms in sysui for menus
 export RPM=echo
-export EPM=DUMMY
-export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}"
+#Set the "This product has been created by..." in Help->About
+export USER="RedHat Inc."
+unset USERNAME
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
 cd transex3/prj
@@ -786,9 +787,15 @@
 echo build end time is `date`
 df -h .
 
+%install
+#dance of the seven veils to get unpackaged install
+export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}"
+export MAXPROCESS=1
+echo start en-US install time is `date`
+dmake openoffice_en-US
+echo start en-US install time is `date`
 %if %{langpacks}
 echo start langpack install time is `date`
-export MAXPROCESS=1
 dmake ooolanguagepack
 echo end langpack install time is `date`
 df -h .
@@ -814,7 +821,7 @@
 popd
 cd ../..
 
-%install
+
 #remove script to munge OOo2 mime info into system, we'll do that
 rm -f $RPM_BUILD_ROOT/%{instdir}/program/update-mime-data
 
@@ -2512,6 +2519,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jun 13 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.109-3
+- add openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch
+- rejig build to use current splashscreen
+
 * Mon Jun 13 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.109-2
 - rh#159169# crash due to dodgy casting when save to legacy impress format
 - ooo#50571#/rh#157813# add workspace.gslpatches2.patch to fix bizarre 


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