add conflict

Rev openSUSE:Tools/119 Md5 4bd034aab4c2e6fbb61566f8f0ee84f0 2011-05-12 10:21:16 adrianSuSE None
This commit is contained in:
OBS User adrianSuSE 2011-05-12 10:21:16 +00:00 committed by Git OBS Bridge
parent 39e32a1d6a
commit 3b210eed0d
4 changed files with 17 additions and 6 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9436cb4fe24a52e9fbe648daf1ff56b10da149f408d8c6ac66d8f692a85ea244
size 264052
oid sha256:1ae0cde5b38fecba0a55bfe736cc16f5f63ac5a1d41bda2befc4c3a0b8739f77
size 265747

View File

@ -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

View File

@ -1,6 +1,6 @@
Format: 1.0
Source: build
Version: 2011.01.20
Version: 2011.03.29
Binary: build
Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: all

View File

@ -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)