From 9c331279be5bb2d8830154f4a1727b877b8a29e4 Mon Sep 17 00:00:00 2001 From: OBS User mlschroe Date: Wed, 15 Dec 2010 13:10:07 +0000 Subject: [PATCH 1/3] update to current git Rev openSUSE:Tools/110 Md5 cf6370fd478b9042ba114eea50c247c1 2010-12-15 13:10:07 mlschroe None --- _service | 2 +- build.changes | 5 +++++ build.spec | 4 ++-- debian.changelog | 9 +++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/_service b/_service index f6b85760..b371c7c2 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - 2010.12.09git://gitorious.org/opensuse/build.gitgit + 2010.12.15git://gitorious.org/opensuse/build.gitgit gz*.tar diff --git a/build.changes b/build.changes index 69271c9e..1d2ec314 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 15 14:05:09 CET 2010 - mls@suse.de + +- also use -o when using bsdtar --chroot + ------------------------------------------------------------------- Thu Dec 9 11:51:40 UTC 2010 - adrian@suse.de diff --git a/build.spec b/build.spec index a2cd7ff8..1070a6d5 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.11.02) +# spec file for package build (Version 2010.12.15) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.12.09 +Version: 2010.12.15 Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz diff --git a/debian.changelog b/debian.changelog index 44dcf69d..e337dd6c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,12 @@ +build (2010.12.15-1) unstable; urgency=low + + * Update to current git trunk + - support bsdtar for setting up build enviroment + - make expanddeps use the highest version of a package if multiple + versions aver available in a repository [bnc#656599] + + -- Michael Schroeder Wed, 15 Dec 2010 14:08:29 +0200 + build (2010.07.28-1) unstable; urgency=low * Update to current git trunk From 4956670a90fe9b46344168aaf70a9d909f185396 Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Wed, 15 Dec 2010 13:10:24 +0000 Subject: [PATCH 2/3] generated via source service Rev openSUSE:Tools/111 Md5 2cd1c86f54459200ba5b5a5d7a463570 2010-12-15 13:10:24 _service None --- _service:recompress:tar_scm:build-2010.12.09.tar.gz | 3 --- _service:recompress:tar_scm:build-2010.12.15.tar.gz | 3 +++ _service:set_version:build.dsc | 2 +- _service:set_version:build.spec | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 _service:recompress:tar_scm:build-2010.12.09.tar.gz create mode 100644 _service:recompress:tar_scm:build-2010.12.15.tar.gz diff --git a/_service:recompress:tar_scm:build-2010.12.09.tar.gz b/_service:recompress:tar_scm:build-2010.12.09.tar.gz deleted file mode 100644 index 3f74f0dc..00000000 --- a/_service:recompress:tar_scm:build-2010.12.09.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e53c56ba2928ae365c08df7465c1941d28b37e7c51dcf8c3e71be6fdc80d67e9 -size 589661 diff --git a/_service:recompress:tar_scm:build-2010.12.15.tar.gz b/_service:recompress:tar_scm:build-2010.12.15.tar.gz new file mode 100644 index 00000000..b51581f2 --- /dev/null +++ b/_service:recompress:tar_scm:build-2010.12.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b051d07de752d3492ffd167316cfc6f302851a914fac550f16fddaef7313058c +size 591817 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc index 5ef22684..8532f8a0 100644 --- a/_service:set_version:build.dsc +++ b/_service:set_version:build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.12.09 +Version: 2010.12.15 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/_service:set_version:build.spec b/_service:set_version:build.spec index e9ecc213..2c05c922 100644 --- a/_service:set_version:build.spec +++ b/_service:set_version:build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.11.02) +# spec file for package build (Version 2010.12.15) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.12.09 +Version: 2010.12.15 Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz From 8f190122da610c30884cc308d2a67f7599c6cd85 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Mon, 28 Feb 2011 09:04:38 +0000 Subject: [PATCH 3/3] update Rev openSUSE:Tools/112 Md5 1da3c1ad152320c860ac216932646eab 2011-02-28 09:04:38 adrianSuSE None --- _service | 13 +- ...recompress:tar_scm:build-2010.12.15.tar.gz | 3 - _service:set_version:build.dsc | 9 -- _service:set_version:build.spec | 128 ------------------ build-2011.01.20.tar.gz | 3 + build.changes | 6 + build.dsc | 2 +- build.spec | 4 +- debian.tar.gz | 3 - 9 files changed, 22 insertions(+), 149 deletions(-) delete mode 100644 _service:recompress:tar_scm:build-2010.12.15.tar.gz delete mode 100644 _service:set_version:build.dsc delete mode 100644 _service:set_version:build.spec create mode 100644 build-2011.01.20.tar.gz delete mode 100644 debian.tar.gz diff --git a/_service b/_service index b371c7c2..6ab45127 100644 --- a/_service +++ b/_service @@ -1,5 +1,12 @@ - 2010.12.15git://gitorious.org/opensuse/build.gitgit -gz*.tar - + + 2011.01.20 + git://gitorious.org/opensuse/build.git + git + + + gz + *.tar + + diff --git a/_service:recompress:tar_scm:build-2010.12.15.tar.gz b/_service:recompress:tar_scm:build-2010.12.15.tar.gz deleted file mode 100644 index b51581f2..00000000 --- a/_service:recompress:tar_scm:build-2010.12.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b051d07de752d3492ffd167316cfc6f302851a914fac550f16fddaef7313058c -size 591817 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc deleted file mode 100644 index 8532f8a0..00000000 --- a/_service:set_version:build.dsc +++ /dev/null @@ -1,9 +0,0 @@ -Format: 1.0 -Source: build -Version: 2010.12.15 -Binary: build -Maintainer: Adrian Schroeter -Architecture: all -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4) - diff --git a/_service:set_version:build.spec b/_service:set_version:build.spec deleted file mode 100644 index 2c05c922..00000000 --- a/_service:set_version:build.spec +++ /dev/null @@ -1,128 +0,0 @@ -# -# spec file for package build (Version 2010.12.15) -# -# Copyright (c) 2010 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 -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -Summary: A Script to Build SUSE Linux RPMs -Version: 2010.12.15 -Release: 1 -#!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 -# Keep the following dependencies in sync with obs-worker package -Requires: bash -Requires: perl -Requires: binutils -Requires: tar -# None of them are actually required for core features. -# Perl helper scripts use them. -%if 0%{?suse_version} > 1000 -Recommends: perl(Date::Language) -Recommends: perl(Date::Parse) -Recommends: perl(LWP::UserAgent) -Recommends: perl(Pod::Usage) -Recommends: perl(Time::Zone) -Recommends: perl(URI) -Recommends: perl(XML::Parser) -Recommends: bsdtar -%endif - -%description -This package provides a script for building RPMs for SUSE Linux in a -chroot environment. - - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -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. - -%package mkdrpms -License: GPLv2+ -Group: Development/Tools/Building -Summary: Tools to generate delta rpms -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/ -%if 0%{?sles_version} - ln -s sles%{sles_version}.conf default.conf -%else -%if 0%{?suse_version} - V=%suse_version - ln -s sl${V:0:2}.${V:2:1}.conf default.conf -%endif -%endif - -%files -%defattr(-,root,root) -%doc README -/usr/bin/build -/usr/bin/buildvc -/usr/bin/unrpm -/usr/lib/build -%{_mandir}/man1/build.1* - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -%exclude /usr/lib/build/mkbaselibs -%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/build-2011.01.20.tar.gz b/build-2011.01.20.tar.gz new file mode 100644 index 00000000..9f2c8587 --- /dev/null +++ b/build-2011.01.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c85b5caf6d889df5654451289adda478442208a0be5d77bc5509f645bf8f342 +size 251392 diff --git a/build.changes b/build.changes index 1d2ec314..70dec5f1 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 28 09:02:32 UTC 2011 - adrian@suse.de + +- do not use current git branch for stable build package in distributions +- require bsdtar for vm builds to ensure a safe build + ------------------------------------------------------------------- Wed Dec 15 14:05:09 CET 2010 - mls@suse.de diff --git a/build.dsc b/build.dsc index 2eda7b74..af2c10c0 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.10.12 +Version: 2011.01.20 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 1070a6d5..237c2760 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: 2010.12.15 -Release: 1 +Version: 2011.01.20 +Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build 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