rpms/rpm/devel rpm-4.4.2-perlreq.patch, NONE, 1.1 rpm.spec, 1.174, 1.175

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4253

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-perlreq.patch 
Log Message:
bump popt and revert to perl.req/prov

rpm-4.4.2-perlreq.patch:
 macros.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE rpm-4.4.2-perlreq.patch ---
--- rpm-4.4.2/macros.in.perlreq	2005-07-26 12:42:38.000000000 -0400
+++ rpm-4.4.2/macros.in	2005-07-26 12:42:47.000000000 -0400
@@ -430,10 +430,10 @@
 #
 # Note: Used iff _use_internal_dependency_generator is non-zero. The
 # helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
-%__perl_provides	@RPMCONFIGDIR@/perldeps.pl --provides
-%__perl_requires	@RPMCONFIGDIR@/perldeps.pl --requires
-#%__perl_provides	@RPMCONFIGDIR@/perl.prov
-#%__perl_requires	@RPMCONFIGDIR@/perl.req
+#%__perl_provides	@RPMCONFIGDIR@/perldeps.pl --provides
+#%__perl_requires	@RPMCONFIGDIR@/perldeps.pl --requires
+%__perl_provides	@RPMCONFIGDIR@/perl.prov
+%__perl_requires	@RPMCONFIGDIR@/perl.req
 
 %__python_provides	@RPMCONFIGDIR@/pythondeps.sh --provides
 %__python_requires	@RPMCONFIGDIR@/pythondeps.sh --requires


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- rpm.spec	25 Jul 2005 12:35:41 -0000	1.174
+++ rpm.spec	26 Jul 2005 17:38:58 -0000	1.175
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 1
+Release: 2
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Patch0: rpm-4.4.1-hkp-disable.patch
@@ -30,6 +30,7 @@
 Patch4: rpm-4.4.1-prepostun.patch
 Patch5: rpm-4.4.1-ordererase.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
+Patch7: rpm-4.4.2-perlreq.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -125,7 +126,7 @@
 %package -n popt
 Summary: A C library for parsing command line parameters.
 Group: Development/Libraries
-Version: 1.10.1
+Version: 1.10.2
 
 %description -n popt
 Popt is a C library for parsing command line parameters. Popt was
@@ -146,6 +147,7 @@
 %patch4 -p1  -b .prepostun
 %patch5 -p1  -b .ordererase
 %patch6 -p1  -b .matchpathcon
+%patch7 -p1  -b .perlreq
 
 
 %build
@@ -537,6 +539,10 @@
 %{__includedir}/popt.h
 
 %changelog
+* Tue Jul 26 2005 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-1
+- popt minor version bump
+- revert to perl.req/perl.prov for now
+
 * Thu Jul 21 2005 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-1
 - Upgrade to upstream release