- find-*-wrappers work for me and _noauto* functionality is needed, so added

  userpmdepswrappers patch to turn them on by default
- release .12

Changed files:
    rpm-userpmdepswrappers.patch -> 1.1
    rpm.spec -> 1.442

diff --git a/rpm-userpmdepswrappers.patch b/rpm-userpmdepswrappers.patch
new file mode 100644 (file)
index 0000000..752bae8
--- /dev/null
+++ b/rpm-userpmdepswrappers.patch
@@ -0,0 +1,28 @@
+--- rpm-4.3/macros.in.orig     2003-06-25 23:53:55.000000000 +0200
++++ rpm-4.3/macros.in  2003-06-25 23:58:35.000000000 +0200
+@@ -321,7 +321,9 @@
+ 
+ #
+ # Use internal dependency generator rather than external helpers?
+-%_use_internal_dependency_generator   1
++# note: we wrap around internal generator (invoked by rpmdeps) to
++#       postprocess provides/requires lists and apply _noauto*
++%_use_internal_dependency_generator   0
+ 
+ #
+ # Path to scripts to autogenerate package dependencies,
+@@ -329,8 +331,12 @@
+ # Note: Used iff _use_internal_dependency_generator is zero.
+ #%__find_provides     @RPMCONFIGDIR@/rpmdeps --provides
+ #%__find_requires     @RPMCONFIGDIR@/rpmdeps --requires
+-%__find_provides      @RPMCONFIGDIR@/find-provides
+-%__find_requires      @RPMCONFIGDIR@/find-requires
++# these are ELF-only generators
++#%__find_provides     @RPMCONFIGDIR@/find-provides
++#%__find_requires     @RPMCONFIGDIR@/find-requires
++# rpmdeps wrappers
++%__find_provides      @RPMCONFIGDIR@/find-provides-wrapper
++%__find_requires      @RPMCONFIGDIR@/find-requires-wrapper
+ #%__find_conflicts    ???
+ #%__find_obsoletes    ???
+ 

diff --git a/rpm.spec b/rpm.spec
index 8548de4ebe2018b43955ed1441bc78b89caf63c3..ecf81ac0d645d40ef3226d392066f239923fdd4a 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,6 +2,7 @@
 # TODO:
 # - learn find-perl-provides to use the __perl macro instead
 #   of /usr/bin/perl
+#   NOTE: there is no find-perl* now, only perl.{prov,req}
 # - use system libmagic not internal libfmagic
 #
 # Conditional build:
@@ -26,7 +27,7 @@ Summary(uk):  
 Name:          rpm
 %define        ver     4.3
 Version:       %{ver}
-%define        rel     0.%{snap}.11
+%define        rel     0.%{snap}.12
 Release:       %{rel}
 License:       GPL
 Group:         Base
@@ -85,6 +86,7 @@ Patch28:      %{name}-python-beecrypt.patch
 Patch29:       %{name}-man-typos.patch
 Patch30:       %{name}-man-pl.patch
 Patch31:       %{name}-fdClose-typo.patch
+Patch32:       %{name}-userpmdepswrappers.patch
 URL:           http://www.rpm.org/
 Icon:          rpm.gif
 BuildRequires: autoconf >= 2.52
@@ -543,6 +545,7 @@ cat %{SOURCE14} >> macros.in
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
 
 cd scripts;
 mv -f perl.req perl.req.in