diff --git a/PKGBUILD b/PKGBUILD index e976a940..a493ca93 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170804 +pkgver=20170918 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes index 6d0f8572..f4229205 100644 --- a/build-mkbaselibs-sle.changes +++ b/build-mkbaselibs-sle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 21 08:58:47 UTC 2017 - coolo@suse.com + +- add conflict to otherproviders + ------------------------------------------------------------------- Wed Aug 2 14:58:59 UTC 2017 - lnussel@suse.de diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 356b86ea..d5fd2b51 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,13 +20,14 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20170804 +Version: 20170918 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +Conflicts: otherproviders(build-mkbaselibs) %description This package contains the parts which may be installed in the inner build system diff --git a/build.changes b/build.changes index ddca9ade..c6e0d886 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 21 08:55:08 UTC 2017 - coolo@suse.com + +- Support getting the container tags from the Dockerfile +- Put the disturl in the .buildenv file +- Support rpm-buildroot-override buildflag +- Support kvm builds on Debian +- Support with/without/unless rich deps +- Added obs-docker-support script for docker images +- Initial SLE 15 config + ------------------------------------------------------------------- Wed Aug 2 14:59:15 UTC 2017 - lnussel@suse.de diff --git a/build.dsc b/build.dsc index 73181a8c..ae063b76 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170804-0 +Version: 20170918-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index e419bb5e..326d8973 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170804 +Version: 20170918 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 62bddf37..5074b3fa 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170804-0) unstable; urgency=low +build (20170918-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170804.tar.gz b/obs-build-20170804.tar.gz deleted file mode 100644 index e8c9ef6c..00000000 --- a/obs-build-20170804.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86f9e08880031b39a7ffbc8a889587710c09262fef747c5427a901a7a955edc0 -size 281132 diff --git a/obs-build-20170918.tar.gz b/obs-build-20170918.tar.gz new file mode 100644 index 00000000..57030fdc --- /dev/null +++ b/obs-build-20170918.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2283610bd833190e26f7ecdf0cd30606ece2854b3357af60f7f3cbe7564cd441 +size 280710