From 2083d3c58fe1677bfebc0a94d930964787a57ed58da803a0d8ed5b85580693c3 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 10 Jan 2011 17:37:51 +0000 Subject: [PATCH] - disable autoreqprov - really drop brp-check-bytecode-version - integrate fix-mail patch into tarball OBS-URL: https://build.opensuse.org/package/show/Base:System/brp-check-suse?expand=0&rev=17 --- brp-check-suse-1.0.tar.bz2 | 4 ++-- brp-check-suse-fix_mail.patch | 11 ----------- brp-check-suse.changes | 11 +++++++++++ brp-check-suse.spec | 4 +--- 4 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 brp-check-suse-fix_mail.patch diff --git a/brp-check-suse-1.0.tar.bz2 b/brp-check-suse-1.0.tar.bz2 index 97e793f..4f1d652 100644 --- a/brp-check-suse-1.0.tar.bz2 +++ b/brp-check-suse-1.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08007fc484399bd4b757b97aee15fe4d3013dce7d18670fa875caf3e4ee42cc9 -size 62798 +oid sha256:ee3a545be9e1dbc8d4f2dd730c97dee49e429f946edce06b1b821f85d541a69c +size 62004 diff --git a/brp-check-suse-fix_mail.patch b/brp-check-suse-fix_mail.patch deleted file mode 100644 index 4b87e43..0000000 --- a/brp-check-suse-fix_mail.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- brp-desktop.data/xdg_menu -+++ brp-desktop.data/xdg_menu -@@ -1980,7 +1980,7 @@ - $output = output_validate($menu); - print $output; - if ( $validate_error eq 1 ) { -- print "Errors in installed desktop file detected. Please mail stbinner\@suse.de, if you think this is wrong.\n"; -+ print "Errors in installed desktop file detected. Please refer to http://en.opensuse.org/SUSE_Package_Conventions/RPM_Macros\n"; - exit 1; - } - exit 0; diff --git a/brp-check-suse.changes b/brp-check-suse.changes index 3d1aac3..295ffbc 100644 --- a/brp-check-suse.changes +++ b/brp-check-suse.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jan 10 18:37:11 CET 2011 - ro@suse.de + +- disable autoreqprov + +------------------------------------------------------------------- +Mon Jan 10 17:55:59 CET 2011 - ro@suse.de + +- really drop brp-check-bytecode-version +- integrate fix-mail patch into tarball + ------------------------------------------------------------------- Mon Jan 10 13:00:04 UTC 2011 - mvyskocil@suse.cz diff --git a/brp-check-suse.spec b/brp-check-suse.spec index 3331bca..8ff0ff3 100644 --- a/brp-check-suse.spec +++ b/brp-check-suse.spec @@ -21,12 +21,11 @@ Name: brp-check-suse License: Artistic License .. ; GPLv2+ Group: Development/Tools/Building -AutoReqProv: on +AutoReqProv: off Summary: build root policy check scripts Version: 1.0 Release: 32 Source0: %{name}-%{version}.tar.bz2 -Patch0: brp-check-suse-fix_mail.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" @@ -39,7 +38,6 @@ build root policy check scripts %prep %setup -q -%patch0 %build # nothing to do