From 3d3d85bcdb0358a2db6c1bc87daddc4203b49049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 6 Oct 2017 13:13:47 +0000 Subject: [PATCH 1/2] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=330 --- PKGBUILD | 2 +- build-mkbaselibs-sle.changes | 5 +++-- build-mkbaselibs-sle.spec | 4 ++-- build.changes | 10 ++-------- build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20170918.tar.gz | 3 --- obs-build-20171006.tar.gz | 3 +++ 9 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 obs-build-20170918.tar.gz create mode 100644 obs-build-20171006.tar.gz diff --git a/PKGBUILD b/PKGBUILD index a493ca93..42915fd1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170918 +pkgver=20171006 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes index f4229205..9b1a59bb 100644 --- a/build-mkbaselibs-sle.changes +++ b/build-mkbaselibs-sle.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Thu Sep 21 08:58:47 UTC 2017 - coolo@suse.com +Wed Aug 23 10:44:57 UTC 2017 - dimstar@opensuse.org -- add conflict to otherproviders +- Conflict with other implementations of mkbaselibs (packages + conflict on file level). ------------------------------------------------------------------- Wed Aug 2 14:58:59 UTC 2017 - lnussel@suse.de diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index d5fd2b51..21380453 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,14 +20,14 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20170918 +Version: 20171006 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs +Conflicts: otherproviders(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 c6e0d886..1ee6cc02 100644 --- a/build.changes +++ b/build.changes @@ -1,13 +1,7 @@ ------------------------------------------------------------------- -Thu Sep 21 08:55:08 UTC 2017 - coolo@suse.com +Fri Oct 6 13:11:26 UTC 2017 - adrian@suse.de -- 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 +- bring back openSUSE Leap 15.0 config ------------------------------------------------------------------- Wed Aug 2 14:59:15 UTC 2017 - lnussel@suse.de diff --git a/build.dsc b/build.dsc index ae063b76..0195d62c 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170918-0 +Version: 20171006-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 326d8973..9fbad9ba 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: 20170918 +Version: 20171006 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index 5074b3fa..0aa57d3c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170918-0) unstable; urgency=low +build (20171006-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170918.tar.gz b/obs-build-20170918.tar.gz deleted file mode 100644 index 57030fdc..00000000 --- a/obs-build-20170918.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2283610bd833190e26f7ecdf0cd30606ece2854b3357af60f7f3cbe7564cd441 -size 280710 diff --git a/obs-build-20171006.tar.gz b/obs-build-20171006.tar.gz new file mode 100644 index 00000000..dee6da5f --- /dev/null +++ b/obs-build-20171006.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97b3cadc48688783fd909d6e34c13f3b290e0622a821fd907601d5dc9f4afaaa +size 306949 From 5a702c8aa29cc1d7f06e34d3773e5af206933545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 12 Oct 2017 16:01:02 +0000 Subject: [PATCH 2/2] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=331 --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 4 ++-- build.dsc | 2 +- build.spec | 9 +-------- debian.changelog | 2 +- obs-build-20171006.tar.gz | 3 --- obs-build-20171012.tar.gz | 3 +++ 8 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 obs-build-20171006.tar.gz create mode 100644 obs-build-20171012.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 42915fd1..1bce096d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171006 +pkgver=20171012 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 21380453..286aa4b6 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20171006 +Version: 20171012 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 1ee6cc02..b9e5ef96 100644 --- a/build.changes +++ b/build.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Oct 6 13:11:26 UTC 2017 - adrian@suse.de +Thu Oct 12 16:00:09 UTC 2017 - adrian@suse.de -- bring back openSUSE Leap 15.0 config +- proper fix for for liblua, for factory and leap 15.0 ------------------------------------------------------------------- Wed Aug 2 14:59:15 UTC 2017 - lnussel@suse.de diff --git a/build.dsc b/build.dsc index 0195d62c..b781cb92 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171006-0 +Version: 20171012-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 9fbad9ba..9a39e3fe 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: 20171006 +Version: 20171012 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,13 +122,6 @@ chroot or a secure virtualized %if 0%{?suse_version} # initvm make CFLAGS="$RPM_BUILD_FLAGS" initvm-all -#XXX temporary hack until lua is actually in -%if 0%{?suse_version} == 1330 -if rpm -q liblua5_3-5; then - V=%suse_version - sed -i -e 's/liblua5_3/liblua5_3-5/g' configs/sl${V:0:2}.${V:2:1}.conf -fi -%endif %endif %install diff --git a/debian.changelog b/debian.changelog index 0aa57d3c..3b87a437 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171006-0) unstable; urgency=low +build (20171012-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20171006.tar.gz b/obs-build-20171006.tar.gz deleted file mode 100644 index dee6da5f..00000000 --- a/obs-build-20171006.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97b3cadc48688783fd909d6e34c13f3b290e0622a821fd907601d5dc9f4afaaa -size 306949 diff --git a/obs-build-20171012.tar.gz b/obs-build-20171012.tar.gz new file mode 100644 index 00000000..c9ca0347 --- /dev/null +++ b/obs-build-20171012.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54c51411f8daa8e13b643aab4a25d322e215ba05b46ce7acd46f7f23bb628253 +size 306914