From d0e305b801825b7073863159aeeb482fc5934c2f Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 17 Nov 2017 09:37:46 +0000 Subject: [PATCH] update Rev openSUSE:Tools/337 Md5 9278b7135136d99e586825b594960a90 2017-11-17 09:37:46 adrianSuSE None --- PKGBUILD | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 4 ++-- debian.changelog | 2 +- obs-build-20171027.tar.gz | 3 --- obs-build-20171117.tar.gz | 3 +++ 8 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20171027.tar.gz create mode 100644 obs-build-20171117.tar.gz diff --git a/PKGBUILD b/PKGBUILD index f722628f..69726831 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171027 +pkgver=20171117 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 73f236ef..58d6f62a 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: 20171027 +Version: 20171117 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 693499ec..4f06801a 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 17 09:36:04 UTC 2017 - adrian@suse.de + +- prepare for suse_version 1550 in factory (by Dominique) + ------------------------------------------------------------------- Thu Nov 9 16:12:53 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index bb5f5063..8fbf2aab 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171027 +Version: 20171117 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 9816e203..8f48002b 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: 20171027 +Version: 20171117 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -149,7 +149,7 @@ ln -s sl42.${SLE_V:3:1}.conf default.conf # this is SUSE Leap 15 and higher ln -s sl${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf %endif -%if !0%{?sle_version} && ( 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 || 0%{?suse_version} == 1330 ) +%if !0%{?sle_version} && ( 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 || 0%{?suse_version} == 1330 || 0%{?suse_version} == 1550 ) # this is old openSUSE releases and Factory ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf %endif diff --git a/debian.changelog b/debian.changelog index 8c147eae..b8ae2d1e 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171027) unstable; urgency=low +build (20171117) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20171027.tar.gz b/obs-build-20171027.tar.gz deleted file mode 100644 index 96b61ac3..00000000 --- a/obs-build-20171027.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44a6902af6dfc4c3970907687d02280a032c4870b0ab493a5070065bee01e9bc -size 307236 diff --git a/obs-build-20171117.tar.gz b/obs-build-20171117.tar.gz new file mode 100644 index 00000000..7e358889 --- /dev/null +++ b/obs-build-20171117.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23fd600470e5bfc557800132206b9ba96d1a47373229dec91beb6318b9fdda48 +size 311395