rpms/kernel/devel find-provides, 1.16, 1.17 kernel-2.6.spec, 1.2765, 1.2766

[fedora-cvs-commits at redhat.com]

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7279

Modified Files:
	find-provides kernel-2.6.spec 
Log Message:
find-provides now takes a directory containing the kabideps file



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- find-provides	11 Oct 2006 18:05:36 -0000	1.16
+++ find-provides	11 Oct 2006 19:29:53 -0000	1.17
@@ -4,6 +4,8 @@
 #
 # This software may be freely redistributed under the terms of the GNU
 # General Public License (GPL).
+#
+# Takes a directory prefix, then outputs the kabideps file contents.
 
 __author__ = "Jon Masters <jcm at redhat.com>"
 __version__ = "1.0"
@@ -20,7 +22,8 @@
 true = 1
 
 kabideps=""
-p = re.compile('^(.*)/(.*)/boot/symvers-(.*).tar.gz$')
+
+p = re.compile('^(.*)/symvers-(.*).gz$')
 while true:
 	foo = sys.stdin.readline()
 	if foo == "":
@@ -28,11 +31,11 @@
 	string.split(foo)
 	m = p.match(foo)
 	if m:
-		kabideps=m.group(1) + "/kernel-" + m.group(3) + "-kabideps"
+		kabideps=sys.argv[1] + "/kernel-" + m.group(2) + "-kabideps"
 	
 if kabideps == "":
 	sys.stderr.write(sys.argv[0] + ": cannot locate kabideps\n")
-	sys.exit(1)
+	sys.exit(0)
 
 if not (os.path.isfile(kabideps)):
 	sys.stderr.write(sys.argv[0] + ": cannot find kabideps data: " + kabideps + "\n")


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2765
retrieving revision 1.2766
diff -u -r1.2765 -r1.2766
--- kernel-2.6.spec	11 Oct 2006 18:08:05 -0000	1.2765
+++ kernel-2.6.spec	11 Oct 2006 19:29:53 -0000	1.2766
@@ -571,8 +571,9 @@
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
+# Pass path of the RPM temp dir containing kabideps to find-provides script.
 %global _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %{_tmppath}/kernel-$KernelVer-kabideps
+%define __find_provides %_sourcedir/find-provides %{_tmppath}
 %define __find_requires /usr/lib/rpm/redhat/find-requires kernel
 
 %ifarch x86_64
@@ -2011,7 +2012,7 @@
 
 * Wed Oct 11 2006 Jon Masters <jcm at redhat.com>
 - kABI dep fixes.
-- Change find-provides to use symvers instead.
+- Change find-provides to use symvers instead and take a directory.
 
 * Wed Oct 11 2006 Dave Jones <davej at redhat.com>
 - Tux lockdep fixes.