From 62eed6a8313ed26ce560ede447669f55f47d396a Mon Sep 17 00:00:00 2001 From: OBS User oertel Date: Thu, 30 Jun 2011 17:07:56 +0000 Subject: [PATCH 1/2] - provide build-mkbaselibs so this can really be used Rev openSUSE:Tools/139 Md5 1bf85d06bb8e1ec93cb0af738a5dbd09 2011-06-30 17:07:56 oertel None --- build-mkbaselibs-sle.changes | 5 +++++ build-mkbaselibs-sle.spec | 9 ++------- build.spec | 14 +------------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes index 545a0955..aba6d28e 100644 --- a/build-mkbaselibs-sle.changes +++ b/build-mkbaselibs-sle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 346df2b8..58687814 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -24,15 +24,15 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Tools to generate base lib packages Version: 2011.06.17 -Release: 0 +Release: 1 #!BuildIgnore: build-mkbaselibs +Provides: 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. @@ -42,10 +42,8 @@ This is the SLE variant including IA64 binary generation. %prep %setup -q -n build-%{version} - %build - %install install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build install -m 0755 mkbaselibs \ @@ -55,13 +53,10 @@ install -m 0644 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.spec b/build.spec index b4fad4a8..bd88171d 100644 --- a/build.spec +++ b/build.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs Version: 2011.06.17 -Release: 0 +Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,7 +50,6 @@ Recommends: perl(XML::Parser) Recommends: bsdtar %endif - %description This package provides a script for building RPMs for SUSE Linux in a chroot environment. @@ -60,14 +59,12 @@ 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. @@ -80,21 +77,17 @@ 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/ @@ -108,7 +101,6 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/ test -e default.conf %endif - %files %defattr(-,root,root) %doc README @@ -123,20 +115,16 @@ 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 35854e0fc0bd13bfaba12df3174e980f81ff9ff3 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 1 Jul 2011 07:27:45 +0000 Subject: [PATCH 2/2] update Rev openSUSE:Tools/140 Md5 cdf92d2a2778b8d65fa3f73104b20b70 2011-07-01 07:27:45 adrianSuSE None --- _service | 2 +- build-2011.06.17.tar.gz | 3 --- build-2011.07.01.tar.gz | 3 +++ build-mkbaselibs-sle.spec | 10 ++++++++-- build.changes | 10 ++++++++++ build.dsc | 2 +- build.spec | 16 ++++++++++++++-- debian.changelog | 6 ++++++ debian.tar.gz | 3 --- 9 files changed, 43 insertions(+), 12 deletions(-) delete mode 100644 build-2011.06.17.tar.gz create mode 100644 build-2011.07.01.tar.gz delete mode 100644 debian.tar.gz diff --git a/_service b/_service index 7759d18f..5e984b89 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.06.17 + 2011.07.01 git://gitorious.org/opensuse/build.git git diff --git a/build-2011.06.17.tar.gz b/build-2011.06.17.tar.gz deleted file mode 100644 index 10e63f90..00000000 --- a/build-2011.06.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cba13cff6031319faf029315ddb945d9199be987c5ec63643aac64d58e97fdb2 -size 268066 diff --git a/build-2011.07.01.tar.gz b/build-2011.07.01.tar.gz new file mode 100644 index 00000000..f389687e --- /dev/null +++ b/build-2011.07.01.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:084956f749d3e778c23039fc7a7d5d9795df338a3ac9b7644b84799127375fb6 +size 269586 diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 58687814..4e752882 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -23,8 +23,8 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: Tools to generate base lib packages -Version: 2011.06.17 -Release: 1 +Version: 2011.07.01 +Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs Source: build-%{version}.tar.gz @@ -33,6 +33,7 @@ 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. @@ -42,8 +43,10 @@ This is the SLE variant including IA64 binary generation. %prep %setup -q -n build-%{version} + %build + %install install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build install -m 0755 mkbaselibs \ @@ -53,10 +56,13 @@ install -m 0644 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 92722814..d61ba07e 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jul 1 07:26:34 UTC 2011 - adrian@suse.de + +- compat mode for broken kiwi of openSUSE 11.4 + +------------------------------------------------------------------- +Thu Jun 30 10:42:15 UTC 2011 - adrian@suse.de + +- fixed kiwi execution call for some versions + ------------------------------------------------------------------- Fri Jun 17 08:35:15 UTC 2011 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 73b5ae6d..4c8fdea0 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.06.17 +Version: 2011.07.01 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index bd88171d..ba7d6264 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.06.17 -Release: 1 +Version: 2011.07.01 +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 diff --git a/debian.changelog b/debian.changelog index e337dd6c..8346d602 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,9 @@ +build (2011.07.01-1) unstable; urgency=low + + * Update to current git trunk + + -- Adrian Schroeter Fri, 01 Jul 2010 10:03:54 +0200 + build (2010.12.15-1) unstable; urgency=low * Update to current git trunk diff --git a/debian.tar.gz b/debian.tar.gz deleted file mode 100644 index 6ff99671..00000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 -size 1524