diff -Nru rpm-5.1.6.orig1/scripts/brp-strip-builddirs rpm-5.1.6/scripts/brp-strip-builddirs --- rpm-5.1.6.orig1/scripts/brp-strip-builddirs 1970-01-01 01:00:00.000000000 +0100 +++ rpm-5.1.6/scripts/brp-strip-builddirs 2009-01-01 18:15:45.000000000 +0100 @@ -0,0 +1,12 @@ +#!/bin/sh + +# If using normal root, avoid changing anything. +if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then + exit 0 +fi + +# Remove the rpm builddir paths in *.la files +find $RPM_BUILD_ROOT -type f -name *.la | \ + xargs -r sed -i '/dependency_libs=/{ + s,-L/usr/src/RPM/BUILD/[^ ]*,,g}' + diff -Nru rpm-5.1.6.orig1/scripts/Makefile.in rpm-5.1.6/scripts/Makefile.in --- rpm-5.2.1.orig/scripts/Makefile.in 2010-05-01 18:57:12.000000000 +0200 +++ rpm-5.2.1/scripts/Makefile.in 2010-07-28 20:01:05.795740791 +0200 @@ -429,8 +429,8 @@ EXTRA_DIST = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ - brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \ - brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ + brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \ + brp-strip-builddirs brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ brp-implant-ident-static brp-java-repack-jars \ check-files cross-build \ deb_Packages deb_Sources \ @@ -460,8 +460,8 @@ bin_SCRIPTS = gendiff pkglib_SCRIPTS = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ - brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \ - brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ + brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \ + brp-strip-builddirs brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ check-files cross-build executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ find-provides.perl \