diff --git a/post-build-checks-1.0.tar.bz2 b/post-build-checks-1.0.tar.bz2 index 3a5e5ff..7329a51 100644 --- a/post-build-checks-1.0.tar.bz2 +++ b/post-build-checks-1.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:048ffc00a6d325f48842aaa06486a64c56f25c0147cf1d0e79dad2e6110dd547 -size 34171 +oid sha256:efb57a803ebc6fc37c77cc5a495865066279b158d12c63da832fdf1bc97bbe5d +size 33145 diff --git a/post-build-checks-nonvoid_new.patch b/post-build-checks-nonvoid_new.patch deleted file mode 100644 index 3c7e376..0000000 --- a/post-build-checks-nonvoid_new.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- checks-data/check_gcc_output -+++ checks-data/check_gcc_output -@@ -22,6 +22,7 @@ - 'warning:.*ignoring return value of (?:.*alloc.*|set.*uid), declared with' => "unchecked-return-value", - 'warning:.*type-punned.*strict-aliasing' => "strict-aliasing-punning", - 'warning:.*control reaches end of non-void function' => "no-return-in-nonvoid-function", -+ 'warning:.*no return statement in function returning non-void' => "no-return-in-nonvoid-function", - 'warning:.*format not a string literal and no format arguments' => "format-security", - 'warning:.*missing sentinel in function call' => "missing-sentinel", - 'warning:.*call to .* will always overflow destination buffer' => "bufferoverflow", 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-parrot.patch b/post-build-checks-parrot.patch deleted file mode 100644 index d6c7f8f..0000000 --- a/post-build-checks-parrot.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./checks/04-check-filelist.orig 2009-08-10 00:17:17.000000000 +0000 -+++ ./checks/04-check-filelist 2010-02-19 10:59:17.000000000 +0000 -@@ -125,6 +125,16 @@ if [ ! -z "$ALL_RPMS" ] ; then - ;; - esac - ;; -+ /usr/src/parrot*) -+ case $RPM_NAME in -+ parrot-devel) -+ ;; -+ *) -+ echo "$RPM_NAME: \"$LINE\" may only be packaged in the parrot-devel package" -+ UNVALID_FILE_FOUND=true -+ ;; -+ esac -+ ;; - # exceptions for CVS/RCS/liveeval - /usr/share/doc/howto/en/txt/RCS|\ - /usr/share/YaST2/data/devtools/*|\ diff --git a/post-build-checks-umount.patch b/post-build-checks-umount.patch deleted file mode 100644 index 8264ebf..0000000 --- a/post-build-checks-umount.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur post-build-checks-1.0/checks/99-check-remove-rpms post-build-checks-1.0-new//checks/99-check-remove-rpms ---- post-build-checks-1.0/checks/99-check-remove-rpms 2008-09-03 15:10:17.000000000 +0200 -+++ post-build-checks-1.0-new//checks/99-check-remove-rpms 2010-02-06 18:28:48.718027110 +0100 -@@ -67,4 +67,7 @@ - } - fi - -- -+# umount proc -+if [ -e $BUILD_ROOT/proc/uptime ] -+ then umount $BUILD_ROOT/proc -+fi diff --git a/post-build-checks.changes b/post-build-checks.changes index 2935ec4..b9fee4f 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 6 17:41:41 UTC 2010 - lnussel@suse.de + +- finally remove 04-check-filelist as it's obsoleted by + CheckFilelist.py in rpmlint + ------------------------------------------------------------------- Wed Apr 7 16:48:52 CEST 2010 - ro@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index e38392a..fac31e2 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -24,14 +24,10 @@ Group: Development/Tools/Building AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 71 +Release: 72 PreReq: aaa_base permissions sed Source0: %{name}-%{version}.tar.bz2 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 @@ -48,10 +44,6 @@ it may not be a good idea to install this to a running system: %prep %setup -q -%patch0 -p1 -%patch1 -%patch2 -%patch3 %build # nothing to do