rpms/openoffice.org/devel openoffice.org.spec, 1.404, 1.405 openoffice.org-1.9.125.oooXXXXX.install.instset_native.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-1.9.125.oooXXXXX.install.instset_native.patch 
Log Message:
new PKGFORMAT magic


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- openoffice.org.spec	22 Aug 2005 14:18:33 -0000	1.404
+++ openoffice.org.spec	22 Aug 2005 19:33:14 -0000	1.405
@@ -170,9 +170,8 @@
 Patch51: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
 Patch52: openoffice.org-1.9.112.ooo53025.exception.package.patch
 Patch53: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch54: openoffice.org-1.9.125.oooXXXXX.install.instset_native.patch
-Patch55: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
-Patch56: workspace.cmcfixes15.patch
+Patch54: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
+Patch55: workspace.cmcfixes15.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -830,9 +829,8 @@
 %patch51 -p1 -b .ooo52626.workspacerestore.vcl.patch
 %patch52 -p1 -b .ooo53025.exception.package.patch
 %patch53 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch54 -p1 -R -b .oooXXXXX.install.instset_native.patch
-%patch55 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
-%patch56 -p1 -b .workspace.cmcfixes15.patch
+%patch54 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
+%patch55 -p1 -b .workspace.cmcfixes15.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -932,7 +930,7 @@
 echo build end time is `date`
 df -h .
 #getting an unpackaged install
-export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}"
+export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 export MAXPROCESS=1
 echo start en-US install time is `date`
 dmake openoffice_en-US


--- openoffice.org-1.9.125.oooXXXXX.install.instset_native.patch DELETED ---