From 882a3b471686d05835b1449bb20b2bf90903ad1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 12 May 2011 10:21:16 +0000 Subject: [PATCH] add conflict OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=119 --- build-2011.03.29.tar.gz | 4 ++-- build.changes | 10 ++++++++++ build.dsc | 2 +- build.spec | 7 ++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build-2011.03.29.tar.gz b/build-2011.03.29.tar.gz index 7f20583..1d8e64a 100644 --- a/build-2011.03.29.tar.gz +++ b/build-2011.03.29.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9436cb4fe24a52e9fbe648daf1ff56b10da149f408d8c6ac66d8f692a85ea244 -size 264052 +oid sha256:1ae0cde5b38fecba0a55bfe736cc16f5f63ac5a1d41bda2befc4c3a0b8739f77 +size 265747 diff --git a/build.changes b/build.changes index cc2ec9a..f32571a 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 12 10:20:53 UTC 2011 - adrian@suse.de + +- conflict with old bsdtar (not supporting --chroot) + +------------------------------------------------------------------- +Wed Apr 27 12:34:17 UTC 2011 - adrian@suse.de + +- revert to single cpu build default for debian packages + ------------------------------------------------------------------- Tue Mar 29 14:59:28 UTC 2011 - lnussel@suse.de diff --git a/build.dsc b/build.dsc index af2c10c..cade670 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.01.20 +Version: 2011.03.29 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index c999226..8319a48 100644 --- a/build.spec +++ b/build.spec @@ -23,8 +23,8 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.03.29 -Release: 1 +Version: 2011.03.29 +Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,9 +36,10 @@ Requires: bash Requires: perl Requires: binutils Requires: tar +Conflicts: bsdtar < 2.5.5 +%if 0%{?suse_version} > 1000 # None of them are actually required for core features. # Perl helper scripts use them. -%if 0%{?suse_version} > 1000 Recommends: perl(Date::Language) Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent)