From 55da51967d8ff29492967b28792d56985bb32ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 26 Nov 2012 08:53:24 +0000 Subject: [PATCH] drop patch OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=197 --- build.spec | 2 -- master.diff | 25 ------------------------- 2 files changed, 27 deletions(-) delete mode 100644 master.diff diff --git a/build.spec b/build.spec index 730b5af..c96ae49 100644 --- a/build.spec +++ b/build.spec @@ -24,7 +24,6 @@ Version: 20121123 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz -Patch0: master.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static @@ -88,7 +87,6 @@ for generating delta rpm packages. %prep %setup -q -n obs-build-%version -%patch0 -p1 %build diff --git a/master.diff b/master.diff deleted file mode 100644 index d08c13a..0000000 --- a/master.diff +++ /dev/null @@ -1,25 +0,0 @@ -From 7d1bfa52e9d2ffd60019481c1e3b96aa06d625ff Mon Sep 17 00:00:00 2001 -From: Andreas Jaeger -Date: Thu, 4 Oct 2012 11:13:13 +0200 -Subject: [PATCH] Mount /proc for rpmlint checks - -Otherwise rpm which is run in chroot will warn about missing /proc - -diff --git a/build b/build -index 4ff7848..d88c094 100755 ---- a/build -+++ b/build -@@ -2299,11 +2299,13 @@ if test -n "$RPMS" -a "$DO_CHECKS" != "false" -a -x "$BUILD_ROOT/opt/testing/bin - rpmlint_logfile=$TOPDIR/OTHER/rpmlint.log - rm -f "$BUILD_ROOT$rpmlint_logfile" - ret=0 -+ mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null - chroot $BUILD_ROOT su -s /opt/testing/bin/rpmlint "$BUILD_USER" -- \ - --info ${LINT_RPM_FILE_LIST[*]#$BUILD_ROOT} \ - ${SRPM_FILE_LIST[*]#$BUILD_ROOT} > "$BUILD_ROOT$rpmlint_logfile" || ret=1 - cat "$BUILD_ROOT$rpmlint_logfile" - echo -+ umount -n $BUILD_ROOT/proc 2>/dev/null || true - if test "$ret" = 1; then - cleanup_and_exit 1 - fi