From 6cee665111e1c3b0e2232b8ef44efdfa81498023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 9 Aug 2016 13:39:29 +0000 Subject: [PATCH 1/2] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=286 --- PKGBUILD | 2 +- build.changes | 9 +++++++++ build.dsc | 2 +- build.spec | 4 ++-- debian.changelog | 2 +- obs-build-20160629.tar.gz | 3 --- obs-build-20160809.tar.gz | 3 +++ 7 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 obs-build-20160629.tar.gz create mode 100644 obs-build-20160809.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 8b3fc65c..d325a76d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20160629 +pkgver=20160809 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 1f7fa930..fd188800 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 9 13:36:48 UTC 2016 - adrian@suse.de + +- first version of Leap 42.2 configuration +- provide loop devices in docker VM +- support lxc 2.0 +- Add architecture-specific sources extract for Arch Linux +- snapcraft improvements + ------------------------------------------------------------------- Thu Jun 30 05:47:52 UTC 2016 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 371b8081..b0768a0a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20160629 +Version: 20160809 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index defadb82..fd9f7647 100644 --- a/build.spec +++ b/build.spec @@ -18,13 +18,13 @@ # needsbinariesforbuild -%define version_unconverted 20160629 +%define version_unconverted 20160809 Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20160629 +Version: 20160809 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index b57f3592..17efeac0 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20160629) unstable; urgency=low +build (20160809) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20160629.tar.gz b/obs-build-20160629.tar.gz deleted file mode 100644 index be41f6b7..00000000 --- a/obs-build-20160629.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2513b5080cbf803cd15124e912a6514996459ce9b828fb520cca1294c3b70e9a -size 240384 diff --git a/obs-build-20160809.tar.gz b/obs-build-20160809.tar.gz new file mode 100644 index 00000000..c5e2a4b1 --- /dev/null +++ b/obs-build-20160809.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:964ed2da8a9eb4ea7d66116e7e0e50cd3669d5243dcbd5534486bc57a9e9bed2 +size 243190 From c5706f56a1ec7049b00fe040c212202a6adbd1cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 11 Aug 2016 13:53:48 +0000 Subject: [PATCH 2/2] Accepting request 418297 from home:lnussel:branches:openSUSE:Tools - calculate leap version for default config OBS-URL: https://build.opensuse.org/request/show/418297 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=287 --- build.changes | 5 +++++ build.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.changes b/build.changes index fd188800..28492acf 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 10 11:51:43 UTC 2016 - lnussel@suse.de + +- calculate leap version for default config + ------------------------------------------------------------------- Tue Aug 9 13:36:48 UTC 2016 - adrian@suse.de diff --git a/build.spec b/build.spec index fd9f7647..4802304e 100644 --- a/build.spec +++ b/build.spec @@ -140,9 +140,11 @@ chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* # main make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if "%{?suse_version}" == "1315" && 0%{?is_opensuse} -# super special leap distro - ln -s sl42.1.conf default.conf +%if 0%{?sle_version} && 0%{?is_opensuse} + # super special leap distro + major="$[%sle_version/10000+30]" + minor="$[%sle_version/100-1200]" + ln -s sl$major.$minor.conf default.conf %else %if 0%{?suse_version} %if 0%{?sles_version}