[master] 292e70e RPM: find-provides should not call find-requires.

Lasse Karstensen lkarsten at varnish-software.com
Fri May 2 11:20:58 CEST 2014


commit 292e70eb6f5bc91299419b63f25b8714ac119f60
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Fri May 2 11:17:23 2014 +0200

    RPM: find-provides should not call find-requires.
    
    Also remove the libvarnishapi "workaround" we put in place
    earlier.
    
    Found by: Ingvar Hagelund
    
    Fixes: #1484

diff --git a/redhat/find-provides b/redhat/find-provides
index bf3ed59..8c7dce5 100755
--- a/redhat/find-provides
+++ b/redhat/find-provides
@@ -4,8 +4,10 @@
 
 set -x
 
-if [ -x /usr/lib/rpm/find-requires ]; then
-    /usr/lib/rpm/find-requires "$@"
+if [ -x /usr/lib/rpm/redhat/find-provides ]; then
+    /usr/lib/rpm/redhat/find-provides "$@"
+elif [ -x /usr/lib/rpm/find-provides ]; then
+    /usr/lib/rpm/find-provides "$@"
 fi
 
 cd $(dirname $0)/..
diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index c1f02cf..09752b8 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -51,11 +51,6 @@ available on the following web site: http://www.varnish-cache.org/
 Summary: Libraries for %{name}
 Group: System Environment/Libraries
 BuildRequires: ncurses-devel
-Provides: libvarnishapi.so.1
-Provides: libvarnishapi.so.1(LIBVARNISHAPI_1.0)(64bit)
-Provides: libvarnishapi.so.1(LIBVARNISHAPI_1.1)(64bit)
-Provides: libvarnishapi.so.1(LIBVARNISHAPI_1.2)(64bit)
-Provides: libvarnishapi.so.1(LIBVARNISHAPI_1.3)(64bit)
 #Obsoletes: libvarnish1
 
 %description libs



More information about the varnish-commit mailing list