teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.11.x-rpmdeps-wrap.patch

Panu Matilainen 7aa67a
commit 43383e0adbd79b2f6847298640f619565e37ad72
Panu Matilainen 7aa67a
Author: Panu Matilainen <pmatilai@redhat.com>
Panu Matilainen 7aa67a
Date:   Tue Apr 8 12:02:24 2014 +0300
Panu Matilainen 7aa67a
Panu Matilainen 7aa67a
       Always use the new dependency generator "engine"
Panu Matilainen 7aa67a
    
Panu Matilainen 7aa67a
        - Replace platform specific find-{requires,provides} scripts with
Panu Matilainen 7aa67a
          trivial wrapper scripts that just call rpmdeps with suitable
Panu Matilainen 7aa67a
          arguments. This way the generated dependencies using the legacy
Panu Matilainen 7aa67a
          external dependency are at least roughly on par with the internal
Panu Matilainen 7aa67a
          depgen as, well, they're generated by the same thing.
Panu Matilainen 7aa67a
        - Changing from find-{requires,provides} scripts to rpmdeps could
Panu Matilainen 7aa67a
          be done by just changing __find_{requires,provides} macros, but
Panu Matilainen 7aa67a
          a lot of packages directly refer to the scripts instead so this
Panu Matilainen 7aa67a
          way we cover far more ground and in an backwards compatible way.
Panu Matilainen 7aa67a
Panu Matilainen 7aa67a
diff --git a/Makefile.am b/Makefile.am
Panu Matilainen 7aa67a
index a6fa619..199cffb 100644
Panu Matilainen 7aa67a
--- a/Makefile.am
Panu Matilainen 7aa67a
+++ b/Makefile.am
Panu Matilainen 7aa67a
@@ -96,8 +96,7 @@ rpmbin_PROGRAMS = rpm
Panu Matilainen 7aa67a
 bin_PROGRAMS =		rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec
Panu Matilainen 7aa67a
 
Panu Matilainen 7aa67a
 rpmlibexec_PROGRAMS =
Panu Matilainen 7aa67a
-rpmconfig_SCRIPTS =	autodeps/find-provides autodeps/find-requires \
Panu Matilainen 7aa67a
-			mkinstalldirs \
Panu Matilainen 7aa67a
+rpmconfig_SCRIPTS =	mkinstalldirs \
Panu Matilainen 7aa67a
 			config.guess config.sub
Panu Matilainen 7aa67a
 DISTCLEANFILES = autodeps/find-provides
Panu Matilainen 7aa67a
 DISTCLEANFILES += autodeps/find-requires
Panu Matilainen 7aa67a
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
Panu Matilainen 7aa67a
index 7656c80..f93901e 100644
Panu Matilainen 7aa67a
--- a/scripts/Makefile.am
Panu Matilainen 7aa67a
+++ b/scripts/Makefile.am
Panu Matilainen 7aa67a
@@ -14,6 +14,7 @@ EXTRA_DIST = \
Panu Matilainen 7aa67a
 	perldeps.pl perl.prov perl.req pythondeps.sh osgideps.pl \
Panu Matilainen 7aa67a
 	rpmdb_loadcvt rpm.daily rpm.log rpm.supp rpm2cpio.sh \
Panu Matilainen 7aa67a
 	tcl.req tgpg vpkg-provides.sh \
Panu Matilainen 7aa67a
+	find-requires find-provides \
Panu Matilainen 7aa67a
 	find-requires.php find-provides.php \
Panu Matilainen 7aa67a
 	find-php-provides find-php-requires \
Panu Matilainen 7aa67a
 	mono-find-requires mono-find-provides \
Panu Matilainen 7aa67a
@@ -28,7 +29,7 @@ rpmconfig_SCRIPTS = \
Panu Matilainen 7aa67a
 	brp-strip-shared brp-strip-static-archive \
Panu Matilainen 7aa67a
 	check-files check-prereqs \
Panu Matilainen 7aa67a
 	check-buildroot check-rpaths check-rpaths-worker \
Panu Matilainen 7aa67a
-	find-lang.sh \
Panu Matilainen 7aa67a
+	find-lang.sh find-requires find-provides \
Panu Matilainen 7aa67a
 	perl.prov perl.req perldeps.pl pythondeps.sh osgideps.pl \
Panu Matilainen 7aa67a
 	mono-find-requires mono-find-provides \
Panu Matilainen 7aa67a
 	pkgconfigdeps.sh libtooldeps.sh \
Panu Matilainen 7aa67a
diff --git a/scripts/find-provides b/scripts/find-provides
Panu Matilainen 7aa67a
new file mode 100644
Panu Matilainen 7aa67a
index 0000000..c5cf93b
Panu Matilainen 7aa67a
--- /dev/null
Panu Matilainen 7aa67a
+++ b/scripts/find-provides
Panu Matilainen 7aa67a
@@ -0,0 +1,3 @@
Panu Matilainen 7aa67a
+#!/bin/sh
Panu Matilainen 7aa67a
+
Panu Matilainen 7aa67a
+/usr/lib/rpm/rpmdeps --provides
Panu Matilainen 7aa67a
diff --git a/scripts/find-requires b/scripts/find-requires
Panu Matilainen 7aa67a
new file mode 100644
Panu Matilainen 7aa67a
index 0000000..9d192dd
Panu Matilainen 7aa67a
--- /dev/null
Panu Matilainen 7aa67a
+++ b/scripts/find-requires
Panu Matilainen 7aa67a
@@ -0,0 +1,3 @@
Panu Matilainen 7aa67a
+#!/bin/sh
Panu Matilainen 7aa67a
+
Panu Matilainen 7aa67a
+/usr/lib/rpm/rpmdeps --requires