rpms/openoffice.org/devel openoffice.org.spec,1.167,1.168

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
try again more like the perl one


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- openoffice.org.spec	27 Apr 2005 14:36:59 -0000	1.167
+++ openoffice.org.spec	27 Apr 2005 18:14:13 -0000	1.168
@@ -11,8 +11,6 @@
 %define gccver 3.4.3
 %define gcjver 4.0.0
 %define _unpackaged_files_terminate_build 0
-%define _use_internal_dependency_generator 0
-# define __find_provides in prep section
 
 ExclusiveArch:  %{ix86} ppc
 Summary:        OpenOffice.org comprehensive office suite.
@@ -87,6 +85,8 @@
 Patch34: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
 Patch100: openoffice.org-1.9.97.rh156039.provides.patch
 
+%define __find_provides %{_tmppath}/find-provides.%{name}
+
 %define instdir %{_libdir}/openoffice.org%{version}
 
 %define withlang --with-lang="%{langpack_langs}"
@@ -633,6 +633,9 @@
 Provides additional zulu translations for %{name}
 
 %prep
+cp -a /usr/lib/rpm/redhat/find-provides %{_tmppath}/find-provides.%{name}
+patch %{_tmppath}/find-provides.%{name} %{PATCH100}
+
 %setup -q -n SRC680_m%{ooo2ver}
 %patch0  -p1 -b .skipuselessmodules.patch
 %patch1  -p1 -b .noregisterwizard
@@ -670,10 +673,6 @@
 %patch33 -p1 -b .ooo35641.noxfonts.vcl.patch
 %patch34 -p1 -b .ooo48256.nolongname.sysui.patch
 
-cp -a /usr/lib/rpm/redhat/find-provides %{_tmppath}/find-provides.%{name}
-patch %{_tmppath}/find-provides.%{name} %{PATCH100}
-%define __find_provides %{_tmppath}/find-provides.%{name}
-
 tar xzf %{SOURCE2}
 %build
 echo build start time is `date`