From aa9cadb9f80e83ffdec8e4971a1fea7ea89242b3 Mon Sep 17 00:00:00 2001 From: OBS User coolo Date: Thu, 27 Sep 2012 07:35:12 +0000 Subject: [PATCH 1/2] - change to automatic date version in _service - update from git (4afd9f0ee03f9e51cf8db9a27fae4663e3f4dde6) Martin Koegler (1): Bug fix: ignore links in orig tar files Michael Schroeder (1): - be more verbose when the preinstallimage unpack fails Stephan Kulow (2): the difference between openSUSE and SLE is outdated do not cumulate packages with 12.2's rpm Rev openSUSE:Tools/187 Md5 a0d93e5e8cfc0f684c4f9a451410e552 2012-09-27 07:35:12 coolo None --- _service | 2 +- build-initvm.spec | 2 +- build.changes | 16 ++++++++++++++++ build.dsc | 2 +- build.spec | 2 +- obs-build-2012.09.25.tar.gz | 3 --- obs-build-20120927.tar.gz | 3 +++ 7 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 obs-build-2012.09.25.tar.gz create mode 100644 obs-build-20120927.tar.gz diff --git a/_service b/_service index 9154f28e..d10d5648 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.09.25 + %ad git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index e7160402..cef4a230 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.09.25 +Version: 20120927 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/build.changes b/build.changes index 4f7e87a9..0d482bd5 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Sep 27 07:33:21 UTC 2012 - coolo@suse.com + +- change to automatic date version in _service +- update from git (4afd9f0ee03f9e51cf8db9a27fae4663e3f4dde6) + +Martin Koegler (1): + Bug fix: ignore links in orig tar files + +Michael Schroeder (1): + - be more verbose when the preinstallimage unpack fails + +Stephan Kulow (2): + the difference between openSUSE and SLE is outdated + do not cumulate packages with 12.2's rpm + ------------------------------------------------------------------- Tue Sep 25 11:25:49 UTC 2012 - coolo@suse.com diff --git a/build.dsc b/build.dsc index 4bf01fdc..61262b99 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.09.25 +Version: 20120927 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 9b7dc621..90db8087 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.09.25 +Version: 20120927 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz diff --git a/obs-build-2012.09.25.tar.gz b/obs-build-2012.09.25.tar.gz deleted file mode 100644 index 6c70eb2d..00000000 --- a/obs-build-2012.09.25.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:500d60a0266b5a50358cc6072b827ca2be4d6062ba746c41ffeb0f9b98a954e2 -size 148557 diff --git a/obs-build-20120927.tar.gz b/obs-build-20120927.tar.gz new file mode 100644 index 00000000..8e8dd1d9 --- /dev/null +++ b/obs-build-20120927.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efccb4d8b7e0f91c762ce23cea6d49753350aff5cc02683ffe080b21f1271bd7 +size 155188 From 56c4556263b754cc98f11d07cefff8314bd34a72 Mon Sep 17 00:00:00 2001 From: OBS User coolo Date: Thu, 27 Sep 2012 07:52:01 +0000 Subject: [PATCH 2/2] baselibs-sle is no longer there Rev openSUSE:Tools/188 Md5 dae8329e78033078084e5140e4cc1ba9 2012-09-27 07:52:01 coolo None --- build.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build.spec b/build.spec index 90db8087..d10df820 100644 --- a/build.spec +++ b/build.spec @@ -92,13 +92,6 @@ 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}