diff --git a/post-build-checks-nosrsc-nodebug.patch b/post-build-checks-nosrsc-nodebug.patch deleted file mode 100644 index 644ca3a..0000000 --- a/post-build-checks-nosrsc-nodebug.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- checks/01-check-debuginfo -+++ checks/01-check-debuginfo -@@ -5,11 +5,29 @@ - fast= - test -x /usr/lib/rpm/rpmi && fast="--nodigest --nosignature" - -+NOSOURCE=0 -+SRPMS=`find $BUILD_ROOT/usr/src/packages/SRPMS -name "*.nosrc.rpm"` -+#grep -qE "^NoSource:|^NoPatch:" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=1 -+test -n "$SRPMS" && NOSOURCE=1 -+grep -qE "^#KEEP NOSOURCE DEBUGINFO" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=0 -+case $PNAME in -+ kernel*|java*|texlive-bin*|glibc*) NOSOURCE=0 ;; -+esac -+ - RPMS=`find $BUILD_ROOT/usr/src/packages/RPMS -name "*-debuginfo-*.rpm" -o -name "*-debugsource-*.rpm"` - test -z "$RPMS" && exit 0 - for rpm in $RPMS ; do - HAS_DEBUG= - HAS_SRC= -+ if test "$NOSOURCE" = "1" ; then -+ echo '!' -+ echo "! $rpm: specfile is nosource, deleting" -+ echo "! to disable have a line \"#KEEP NOSOURCE DEBUGINFO\" in your specfile" -+ echo '!' -+ rm -f "$rpm" -+ continue -+ fi -+ - for l in `rpm -qpl $fast "$rpm"` ; do - case "$l" in - /usr/lib/debug/*) HAS_DEBUG=true ;; diff --git a/post-build-checks.changes b/post-build-checks.changes index 2935ec4..05a8241 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 7 16:48:52 CEST 2010 - ro@suse.de - -- remove debuginfo packages for nosrc rpms unless - package is either kernel or java or texlive-bin or glibc - or removal is disabled in specfile by adding a line - #KEEP NOSOURCE DEBUGINFO - to the specfile (bnc#572695) - ------------------------------------------------------------------- Tue Feb 23 12:21:52 CET 2010 - ro@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index af6ac54..7fde763 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -31,7 +31,6 @@ Source1: suse-buildsystem.sh Patch0: %{name}-umount.patch Patch1: %{name}-parrot.patch Patch2: post-build-checks-nonvoid_new.patch -Patch3: post-build-checks-nosrsc-nodebug.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,7 +50,6 @@ it may not be a good idea to install this to a running system: %patch0 -p1 %patch1 %patch2 -%patch3 %build # nothing to do