rpms/am-utils/devel am-utils.spec,1.22,1.23

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Mar 23 14:44:06 UTC 2005


Update of /cvs/dist/rpms/am-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32042

Modified Files:
	am-utils.spec 
Log Message:
find requires solved



Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- am-utils.spec	23 Mar 2005 08:36:15 -0000	1.22
+++ am-utils.spec	23 Mar 2005 14:44:03 -0000	1.23
@@ -20,8 +20,8 @@
 Obsoletes: amd
 
 # We need to filter out some perl requirements for now.
-#%define _use_internal_dependency_generator 0
-#%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
+%define _use_internal_dependency_generator 0
+%define old_find_requires %{__find_requires}
 
 %description
 Am-utils includes an updated version of Amd, the popular BSD
@@ -44,7 +44,7 @@
 autoheader
 %patch1 -p1 -b .gcc4
 
-find_requires=`rpm --eval %%{__find_requires}`
+find_requires=%{old_find_requires}
 echo "$find_requires | grep -v lostaltmail.conf" > find-requires
 chmod +x find-requires
 
@@ -87,6 +87,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
+
 %pre
 # Check if we have an old fashioned amd.conf and rename if to amd.net
 if test "$1" -ne 0




More information about the fedora-cvs-commits mailing list