From f2d097bac78bafa8dcbbe7e9cafe5b089bf5b8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 23 Apr 2012 09:50:12 +0000 Subject: [PATCH 1/2] no more ia64 builds on openSUSE OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=160 --- build.changes | 5 +++++ build.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/build.changes b/build.changes index 0c2cd5b8..075f15aa 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 23 09:49:45 UTC 2012 - adrian@suse.de + +- do not use sle-baselibs.conf on openSUSE + ------------------------------------------------------------------- Tue Apr 17 13:54:12 UTC 2012 - cfarrell@suse.com diff --git a/build.spec b/build.spec index 6259a8f7..72425169 100644 --- a/build.spec +++ b/build.spec @@ -91,11 +91,13 @@ for generating delta rpm packages. %install make DESTDIR=$RPM_BUILD_ROOT install +%if 0%{?sles_version} %if 0%{?sles_version} < 12 # use sle variation with IA64 compat package generation install -m 0644 baselibs_global-sle.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf %endif +%endif cd $RPM_BUILD_ROOT/usr/lib/build/configs/ %if 0%{?suse_version} %if 0%{?sles_version} From e952a767f34ae448bca1b4ffad551bbd22f3e613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 24 Apr 2012 14:02:52 +0000 Subject: [PATCH 2/2] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=161 --- _service | 2 +- build-initvm.spec | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 8 ++++++++ build.dsc | 2 +- build.spec | 2 +- obs-build-2012.03.17.tar.gz | 3 --- obs-build-2012.04.24.tar.gz | 3 +++ 8 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 obs-build-2012.03.17.tar.gz create mode 100644 obs-build-2012.04.24.tar.gz diff --git a/_service b/_service index 135d2f96..ec86a2bb 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.03.17 + 2012.04.24 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index 0fa761ed..ba6df351 100644 --- a/build-initvm.spec +++ b/build-initvm.spec @@ -20,7 +20,7 @@ Name: build-initvm Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.03.17 +Version: 2012.04.24 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 52ca0103..afb4d898 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: 2012.03.17 +Version: 2012.04.24 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 075f15aa..3c28f809 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 24 13:59:49 UTC 2012 - adrian@suse.de + +- fixed breakage with older perls +- ~ support for rpm version compare +- handle broken deb packages better +- no more hardcoded copy-in of qemu* binaries + ------------------------------------------------------------------- Mon Apr 23 09:49:45 UTC 2012 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 89124dec..594fdc8a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.03.17 +Version: 2012.04.24 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 72425169..37427ced 100644 --- a/build.spec +++ b/build.spec @@ -20,7 +20,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 2012.03.17 +Version: 2012.04.24 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz diff --git a/obs-build-2012.03.17.tar.gz b/obs-build-2012.03.17.tar.gz deleted file mode 100644 index fba74c92..00000000 --- a/obs-build-2012.03.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53563bdc4bdd108a6db46e83d9947a3ebd808a64823ae826f5851debec174ec9 -size 133911 diff --git a/obs-build-2012.04.24.tar.gz b/obs-build-2012.04.24.tar.gz new file mode 100644 index 00000000..171a4d2d --- /dev/null +++ b/obs-build-2012.04.24.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f678e4cbb3fc635c14fbd803e3dbe46569ac6cf7eb4794accb194ce53ed5880 +size 134475