rpms/rpm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bump popt and revert to perl.req/prov

Browse Source
This commit is contained in:
Paul Nasrat 2005-07-26 17:38:58 +00:00
parent 0cb3a4ba7e
commit e447ee7038
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpm-4.4.2-perlreq.patch Normal file
View File

@ -0,0 +1,17 @@
--- 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

10
rpm.spec
View File

@ -20,7 +20,7 @@ Name: rpm
%define version 4.4.2 %define version 4.4.2
Version: %{version} Version: %{version}
%{expand: %%define rpm_version %{version}} %{expand: %%define rpm_version %{version}}
Release: 1 Release: 2
Group: System Environment/Base Group: System Environment/Base
Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
Patch0: rpm-4.4.1-hkp-disable.patch Patch0: rpm-4.4.1-hkp-disable.patch
@ -30,6 +30,7 @@ Patch3: rpm-4.4.1-nonmerged.patch
Patch4: rpm-4.4.1-prepostun.patch Patch4: rpm-4.4.1-prepostun.patch
Patch5: rpm-4.4.1-ordererase.patch Patch5: rpm-4.4.1-ordererase.patch
Patch6: rpm-4.4.2-matchpathcon.patch Patch6: rpm-4.4.2-matchpathcon.patch
Patch7: rpm-4.4.2-perlreq.patch
License: GPL License: GPL
Conflicts: patch < 2.5 Conflicts: patch < 2.5
%ifos linux %ifos linux
@ -125,7 +126,7 @@ programs that will manipulate RPM packages and databases.
%package -n popt %package -n popt
Summary: A C library for parsing command line parameters. Summary: A C library for parsing command line parameters.
Group: Development/Libraries Group: Development/Libraries
Version: 1.10.1 Version: 1.10.2
%description -n popt %description -n popt
Popt is a C library for parsing command line parameters. Popt was Popt is a C library for parsing command line parameters. Popt was
@ -146,6 +147,7 @@ shell-like rules.
%patch4 -p1 -b .prepostun %patch4 -p1 -b .prepostun
%patch5 -p1 -b .ordererase %patch5 -p1 -b .ordererase
%patch6 -p1 -b .matchpathcon %patch6 -p1 -b .matchpathcon
%patch7 -p1 -b .perlreq
%build %build
@ -537,6 +539,10 @@ exit 0
%{__includedir}/popt.h %{__includedir}/popt.h
%changelog %changelog
* Tue Jul 26 2005 Paul Nasrat <pnasrat@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@redhat.com> - 4.4.2-1 * Thu Jul 21 2005 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-1
- Upgrade to upstream release - Upgrade to upstream release