From a9a21886d0d1b8f1bf47a05a2b6ad4825bf3663c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 17 Jan 2017 13:22:32 +0000 Subject: [PATCH 1/2] Accepting request 450943 from home:bluca:branches:openSUSE:Tools Add Conflicts, Replaces, Provides: obs-build to debian/control build is available in the Debian archive and provides the same files. Without Conflicts/Replaces/Provides installations and upgrades fails as the two packages own the same files and there's a filesystem conflict: Unpacking obs-build (20141024-1) ... dpkg: error processing archive /var/cache/apt/archives/obs-build_20141024-1_all.deb (--unpack): trying to overwrite '/usr/share/man/man1/unrpm.1.gz', which is also in package build 20161206 As the Debian policy mandates this can be solved with the above changes: https://www.debian.org/doc/debian-policy/ch-relationships.html OBS-URL: https://build.opensuse.org/request/show/450943 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=297 --- debian.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.tar.gz b/debian.tar.gz index eaad735d..199e34ce 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e34c026a23793c9a7a29d142eac1c2dc1f29d268204ebc1493cd991a15f6a518 -size 1832 +oid sha256:9046961c3e5f2f0f18a2d8bcd83e83dbb84953ee5fbbf45c01ba3c217a9c6eb3 +size 1561 From d054c1dcf0ad0c8e65462748ceef936ebbdd04c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 Jan 2017 16:09:06 +0000 Subject: [PATCH 2/2] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=298 --- PKGBUILD | 2 +- build.changes | 7 +++++++ build.dsc | 2 +- build.spec | 6 +++--- debian.changelog | 2 +- obs-build-20161206.tar.gz | 3 --- obs-build-20170112.tar.gz | 3 +++ 7 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20161206.tar.gz create mode 100644 obs-build-20170112.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 0f146636..011f77b5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20161206 +pkgver=20170112 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 9498809c..d42cd5f6 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 25 16:06:13 UTC 2017 - adrian@suse.de + +- fix haskell builds (bsc#1018895) +- fix multi type kiwi profile handling +- minor distribution config and bug fixes + ------------------------------------------------------------------- Tue Dec 6 15:36:20 UTC 2016 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 8b603747..17280073 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20161206 +Version: 20170112 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 862a10fd..a1f9ecdf 100644 --- a/build.spec +++ b/build.spec @@ -1,7 +1,7 @@ # # spec file for package build # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ # needsbinariesforbuild -%define version_unconverted 20161206 +%define version_unconverted 20170112 Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20161206 +Version: 20170112 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 809cd4b8..db9ccea1 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20161206) unstable; urgency=low +build (20170112) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20161206.tar.gz b/obs-build-20161206.tar.gz deleted file mode 100644 index 616e264a..00000000 --- a/obs-build-20161206.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41c8c78b5bf3439ae0c34f955f8b2ccd5a044806930bb20152da73101a848e23 -size 255989 diff --git a/obs-build-20170112.tar.gz b/obs-build-20170112.tar.gz new file mode 100644 index 00000000..de32e719 --- /dev/null +++ b/obs-build-20170112.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4561496f4150d3e94ec9ea7dee992a06859826b68024e311b485f536c2061dfb +size 255315