From fdb373a380f3e460133c2c39ee6f317fa0903bfc Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 6 Jun 2011 14:58:21 +0000 Subject: [PATCH 1/6] drop ia64 baselibs Rev openSUSE:Tools/125 Md5 546e6a5dee32422fe990ccd21d84694b 2011-06-06 14:58:21 adrianSuSE None --- _service | 2 +- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 16 ++++++++++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/_service b/_service index be8758d4..4862d924 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.05.24 + 2011.06.06 git://gitorious.org/opensuse/build.git git diff --git a/build.changes b/build.changes index 6b4a51a9..0b91bbad 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 6 14:57:47 UTC 2011 - adrian@suse.de + +- do not build ia64 baselibs packages for openSUSE anymore + ------------------------------------------------------------------- Wed May 25 12:14:38 UTC 2011 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 027f0a20..5c818912 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.05.24 +Version: 2011.06.06 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 61c9cb15..d360e8bb 100644 --- a/build.spec +++ b/build.spec @@ -23,8 +23,8 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.05.24 -Release: 0 +Version: 2011.06.06 +Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +50,7 @@ Recommends: perl(XML::Parser) Recommends: bsdtar %endif + %description This package provides a script for building RPMs for SUSE Linux in a chroot environment. @@ -59,12 +60,14 @@ chroot environment. Requires: build-mkbaselibs Recommends: build-mkdrpms + %package mkbaselibs License: GPLv2+ Group: Development/Tools/Building Summary: Tools to generate base lib packages # NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules) + %description mkbaselibs This package contains the parts which may be installed in the inner build system for generating base lib packages. @@ -77,17 +80,21 @@ Requires: deltarpm # XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq Requires: build + %description mkdrpms This package contains the parts which may be installed in the inner build system for generating delta rpm packages. %endif + %prep %setup -q + %build + %install make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ @@ -101,6 +108,7 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/ test -e default.conf %endif + %files %defattr(-,root,root) %doc README @@ -115,16 +123,20 @@ test -e default.conf %exclude /usr/lib/build/baselibs* %exclude /usr/lib/build/mkdrpms + %files mkbaselibs %defattr(-,root,root) %dir /usr/lib/build /usr/lib/build/mkbaselibs /usr/lib/build/baselibs* + %files mkdrpms %defattr(-,root,root) %dir /usr/lib/build /usr/lib/build/mkdrpms %endif + + %changelog From e1349e995c8229402511014ed3880845a34e8cab Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 6 Jun 2011 15:05:28 +0000 Subject: [PATCH 2/6] add extra -sle baselibs config package spec file Rev openSUSE:Tools/127 Md5 97b6f9ee796ecadd57c86f425f858654 2011-06-06 15:05:28 adrianSuSE None --- build-2011.05.24.tar.gz | 3 -- build-2011.06.06.tar.gz | 3 ++ build-mkbaselibs-sle.spec | 67 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) delete mode 100644 build-2011.05.24.tar.gz create mode 100644 build-2011.06.06.tar.gz create mode 100644 build-mkbaselibs-sle.spec diff --git a/build-2011.05.24.tar.gz b/build-2011.05.24.tar.gz deleted file mode 100644 index 136ed7c7..00000000 --- a/build-2011.05.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:036b3b2158065127c2942267f370b3b440503efb3724bc0a653a03e4d85b83e6 -size 267240 diff --git a/build-2011.06.06.tar.gz b/build-2011.06.06.tar.gz new file mode 100644 index 00000000..ae833d18 --- /dev/null +++ b/build-2011.06.06.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb4d14e62343b2fdb7ba373cccb6cc01ebc25c70f90a7e50e0a2407b64274fff +size 267303 diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec new file mode 100644 index 00000000..bbaf4db0 --- /dev/null +++ b/build-mkbaselibs-sle.spec @@ -0,0 +1,67 @@ +# +# spec file for package build-mkbaselibs-sle +# +# Copyright (c) 2011 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/ +# + +# norootforbuild + + +Name: build-mkbaselibs-sle +License: GPLv2+ +Group: Development/Tools/Building +AutoReqProv: on +Summary: Tools to generate base lib packages +Version: 2011.06.06 +Release: 0 +#!BuildIgnore: build-mkbaselibs +Source: 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 + + +%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 From 0269308de9943ede002d7c45c53f4a9b66571784 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 6 Jun 2011 15:12:42 +0000 Subject: [PATCH 3/6] add changes Rev openSUSE:Tools/132 Md5 e28f9084bdc7cbd1ecc2dbe0957fcc1a 2011-06-06 15:12:42 adrianSuSE None --- build-mkbaselibs-sle.changes | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 build-mkbaselibs-sle.changes diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes new file mode 100644 index 00000000..87fb4e13 --- /dev/null +++ b/build-mkbaselibs-sle.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Jun 6 15:12:13 UTC 2011 - adrian@suse.de + +- new package for SLE baselibsconf, including ia64 arch defaults + From 0e02ff1ccd717d4ba51247c83d5eb312e23f0f9e Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 7 Jun 2011 19:19:25 +0000 Subject: [PATCH 4/6] apply at the right place Rev openSUSE:Tools/134 Md5 d857402ca5cff2b0e83020b19075c068 2011-06-07 19:19:25 adrianSuSE None --- build-mkbaselibs-sle.changes | 5 +++++ build-mkbaselibs-sle.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes index 87fb4e13..545a0955 100644 --- a/build-mkbaselibs-sle.changes +++ b/build-mkbaselibs-sle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 7 09:31:51 UTC 2011 - k0da@opensuse.org + +- fix build + ------------------------------------------------------------------- Mon Jun 6 15:12:13 UTC 2011 - adrian@suse.de diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index bbaf4db0..9e1ecb7f 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -40,7 +40,7 @@ for generating base lib packages. This is the SLE variant including IA64 binary generation. %prep -%setup -q +%setup -q -n build-%{version} %build From 1e8fac6af26559f7f2c49a346195cc6528c3c820 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 17 Jun 2011 08:35:38 +0000 Subject: [PATCH 5/6] update Rev openSUSE:Tools/136 Md5 c0a01774a20ff2db7150084685e0ff6c 2011-06-17 08:35:38 adrianSuSE None --- _service | 2 +- build-2011.06.06.tar.gz | 3 --- build-2011.06.17.tar.gz | 3 +++ build.changes | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 build-2011.06.06.tar.gz create mode 100644 build-2011.06.17.tar.gz diff --git a/_service b/_service index 4862d924..7759d18f 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.06.06 + 2011.06.17 git://gitorious.org/opensuse/build.git git diff --git a/build-2011.06.06.tar.gz b/build-2011.06.06.tar.gz deleted file mode 100644 index ae833d18..00000000 --- a/build-2011.06.06.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb4d14e62343b2fdb7ba373cccb6cc01ebc25c70f90a7e50e0a2407b64274fff -size 267303 diff --git a/build-2011.06.17.tar.gz b/build-2011.06.17.tar.gz new file mode 100644 index 00000000..10e63f90 --- /dev/null +++ b/build-2011.06.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cba13cff6031319faf029315ddb945d9199be987c5ec63643aac64d58e97fdb2 +size 268066 diff --git a/build.changes b/build.changes index 0b91bbad..92722814 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 17 08:35:15 UTC 2011 - adrian@suse.de + +- support new kiwi command line mode + ------------------------------------------------------------------- Mon Jun 6 14:57:47 UTC 2011 - adrian@suse.de From e2eaed62f5fc46cf6c068de86e62cf4d709ad213 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 17 Jun 2011 08:45:46 +0000 Subject: [PATCH 6/6] fix version Rev openSUSE:Tools/137 Md5 ea9a85bfd575e0974ddca54932334fe4 2011-06-17 08:45:46 adrianSuSE None --- build-mkbaselibs-sle.spec | 2 +- build.dsc | 2 +- build.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 9e1ecb7f..346df2b8 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: Tools to generate base lib packages -Version: 2011.06.06 +Version: 2011.06.17 Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz diff --git a/build.dsc b/build.dsc index 5c818912..73b5ae6d 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.06.06 +Version: 2011.06.17 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index d360e8bb..b4fad4a8 100644 --- a/build.spec +++ b/build.spec @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.06.06 +Version: 2011.06.17 Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz