From 1e7e312821798224cbc7c5336797089f50abc395 Mon Sep 17 00:00:00 2001 From: OBS User coolo Date: Tue, 25 Sep 2012 08:31:36 +0000 Subject: [PATCH 1/2] - fix logic for cumulating packages Rev openSUSE:Tools/184 Md5 aa902640e29b988bcd2818de7e3f2e94 2012-09-25 08:31:36 coolo None --- _service | 2 +- build-initvm.spec | 2 +- build-mkbaselibs-sle.spec | 2 +- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 2 +- obs-build-2012.09.24.tar.gz | 3 --- obs-build-2012.09.25.tar.gz | 3 +++ 8 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 obs-build-2012.09.24.tar.gz create mode 100644 obs-build-2012.09.25.tar.gz diff --git a/_service b/_service index 46228a1b..9154f28e 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2012.09.24 + 2012.09.25 git://github.com/openSUSE/obs-build.git git diff --git a/build-initvm.spec b/build-initvm.spec index d8273dc8..e7160402 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.24 +Version: 2012.09.25 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 12c34381..04dd8860 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.09.24 +Version: 2012.09.25 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs diff --git a/build.changes b/build.changes index 7547467a..02290778 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 25 08:30:55 UTC 2012 - coolo@suse.com + +- fix logic for cumulating packages + ------------------------------------------------------------------- Mon Sep 24 15:47:27 UTC 2012 - coolo@suse.com diff --git a/build.dsc b/build.dsc index fa70f5f8..4bf01fdc 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.09.24 +Version: 2012.09.25 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index a6f0b333..9b7dc621 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.24 +Version: 2012.09.25 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz diff --git a/obs-build-2012.09.24.tar.gz b/obs-build-2012.09.24.tar.gz deleted file mode 100644 index 0e84e4e3..00000000 --- a/obs-build-2012.09.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03cadd808a9ae61a1b3c580b28bf7c837ae6e46f064c6451020326370c062c07 -size 155485 diff --git a/obs-build-2012.09.25.tar.gz b/obs-build-2012.09.25.tar.gz new file mode 100644 index 00000000..badf51cd --- /dev/null +++ b/obs-build-2012.09.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a475993c730ce6b9826d0e58398502e9cc7b98dba5c334a36d0503ca099dcd9 +size 155449 From 03dfc61c5dabe287aaee3a199f7114e7a88da96e Mon Sep 17 00:00:00 2001 From: OBS User coolo Date: Tue, 25 Sep 2012 11:37:13 +0000 Subject: [PATCH 2/2] - remove build-mkbaselibs-sle, the split is no longer necessary - remove default requires for devel-32bit Rev openSUSE:Tools/185 Md5 9470d83cf6462fb0be28da79bf3b055e 2012-09-25 11:37:13 coolo None --- build-mkbaselibs-sle.changes | 15 --------- build-mkbaselibs-sle.spec | 59 ------------------------------------ build.changes | 6 ++++ obs-build-2012.09.25.tar.gz | 4 +-- 4 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 build-mkbaselibs-sle.changes delete mode 100644 build-mkbaselibs-sle.spec diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes deleted file mode 100644 index aba6d28e..00000000 --- a/build-mkbaselibs-sle.changes +++ /dev/null @@ -1,15 +0,0 @@ -------------------------------------------------------------------- -Thu Jun 30 19:05:52 CEST 2011 - ro@suse.de - -- provide build-mkbaselibs so this can really be used - -------------------------------------------------------------------- -Tue Jun 7 09:31:51 UTC 2011 - k0da@opensuse.org - -- fix build - -------------------------------------------------------------------- -Mon Jun 6 15:12:13 UTC 2011 - adrian@suse.de - -- new package for SLE baselibsconf, including ia64 arch defaults - diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec deleted file mode 100644 index 04dd8860..00000000 --- a/build-mkbaselibs-sle.spec +++ /dev/null @@ -1,59 +0,0 @@ -# -# spec file for package build-mkbaselibs-sle -# -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -Name: build-mkbaselibs-sle -Summary: Tools to generate base lib packages -License: GPL-2.0+ -Group: Development/Tools/Building -Version: 2012.09.25 -Release: 0 -#!BuildIgnore: build-mkbaselibs -Provides: build-mkbaselibs -Source: obs-build-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -# Manual requires to avoid hard require to bash-static -AutoReqProv: off - -%description -This package contains the parts which may be installed in the inner build system -for generating base lib packages. - -This is the SLE variant including IA64 binary generation. - -%prep -%setup -q -n obs-build-%{version} - -%build - -%install -install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build -install -m 0755 mkbaselibs \ - $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs -install -m 0644 baselibs_global-deb.conf \ - $RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf -install -m 0644 baselibs_global-sle.conf \ - $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf - -%files -%defattr(-,root,root) -%dir /usr/lib/build -/usr/lib/build/mkbaselibs -/usr/lib/build/baselibs* - -%changelog diff --git a/build.changes b/build.changes index 02290778..4f7e87a9 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 25 11:25:49 UTC 2012 - coolo@suse.com + +- remove build-mkbaselibs-sle, the split is no longer necessary +- remove default requires for devel-32bit + ------------------------------------------------------------------- Tue Sep 25 08:30:55 UTC 2012 - coolo@suse.com diff --git a/obs-build-2012.09.25.tar.gz b/obs-build-2012.09.25.tar.gz index badf51cd..6c70eb2d 100644 --- a/obs-build-2012.09.25.tar.gz +++ b/obs-build-2012.09.25.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a475993c730ce6b9826d0e58398502e9cc7b98dba5c334a36d0503ca099dcd9 -size 155449 +oid sha256:500d60a0266b5a50358cc6072b827ca2be4d6062ba746c41ffeb0f9b98a954e2 +size 148557