From 643a01cb91f1eacd238a7d19f6fb2bda38fd9596 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 1 Mar 2011 15:36:09 +0000 Subject: [PATCH 1/5] fix xen build Rev openSUSE:Tools/115 Md5 717c7ad7bc180d3a12d6123202ccd493 2011-03-01 15:36:09 adrianSuSE None --- build-2011.01.20.tar.gz | 4 ++-- build.changes | 5 +++++ build.spec | 8 ++++---- debian.tar.gz | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 debian.tar.gz diff --git a/build-2011.01.20.tar.gz b/build-2011.01.20.tar.gz index 9f2c8587..e296a610 100644 --- a/build-2011.01.20.tar.gz +++ b/build-2011.01.20.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c85b5caf6d889df5654451289adda478442208a0be5d77bc5509f645bf8f342 -size 251392 +oid sha256:b528153350081d4c9f7733417b4ae9f328aeeaef79d7cc733ff4174032005e91 +size 254241 diff --git a/build.changes b/build.changes index 70dec5f1..f325397c 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 1 15:35:21 UTC 2011 - adrian@suse.de + +- fix xen build support + ------------------------------------------------------------------- Mon Feb 28 09:02:32 UTC 2011 - adrian@suse.de diff --git a/build.spec b/build.spec index 237c2760..b4d8b830 100644 --- a/build.spec +++ b/build.spec @@ -1,7 +1,7 @@ # -# spec file for package build (Version 2010.12.15) +# spec file for package build # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -23,8 +23,8 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2011.01.20 -Release: 0 +Version: 2011.01.20 +Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.tar.gz b/debian.tar.gz new file mode 100644 index 00000000..6ff99671 --- /dev/null +++ b/debian.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524 From 39e32a1d6a0ef83b3c2609aa9bfc68a90b1038eb Mon Sep 17 00:00:00 2001 From: OBS User lnussel Date: Tue, 29 Mar 2011 15:32:18 +0000 Subject: [PATCH 2/5] - make sure default.conf is no stale symlink Rev openSUSE:Tools/117 Md5 72a8e30ae45741c2edc0c1824e93067c 2011-03-29 15:32:18 lnussel None --- _service | 2 +- build-2011.01.20.tar.gz | 3 --- build-2011.03.29.tar.gz | 3 +++ build.changes | 5 +++++ build.spec | 5 +++-- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 build-2011.01.20.tar.gz create mode 100644 build-2011.03.29.tar.gz diff --git a/_service b/_service index 6ab45127..451c79ee 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.01.20 + 2011.03.29 git://gitorious.org/opensuse/build.git git diff --git a/build-2011.01.20.tar.gz b/build-2011.01.20.tar.gz deleted file mode 100644 index e296a610..00000000 --- a/build-2011.01.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b528153350081d4c9f7733417b4ae9f328aeeaef79d7cc733ff4174032005e91 -size 254241 diff --git a/build-2011.03.29.tar.gz b/build-2011.03.29.tar.gz new file mode 100644 index 00000000..7f205834 --- /dev/null +++ b/build-2011.03.29.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9436cb4fe24a52e9fbe648daf1ff56b10da149f408d8c6ac66d8f692a85ea244 +size 264052 diff --git a/build.changes b/build.changes index f325397c..cc2ec9ab 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 29 14:59:28 UTC 2011 - lnussel@suse.de + +- make sure default.conf is no stale symlink + ------------------------------------------------------------------- Tue Mar 1 15:35:21 UTC 2011 - adrian@suse.de diff --git a/build.spec b/build.spec index b4d8b830..c999226b 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.01.20 +Version: 2011.03.29 Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz @@ -90,13 +90,14 @@ for generating delta rpm packages. %install make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +%if 0%{?suse_version} %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 +test -e default.conf %endif %files From 3b210eed0de0d73bbabe77b7ab5ac15df2c8ba63 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 12 May 2011 10:21:16 +0000 Subject: [PATCH 3/5] add conflict Rev openSUSE:Tools/119 Md5 4bd034aab4c2e6fbb61566f8f0ee84f0 2011-05-12 10:21:16 adrianSuSE None --- build-2011.03.29.tar.gz | 4 ++-- build.changes | 10 ++++++++++ build.dsc | 2 +- build.spec | 7 ++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build-2011.03.29.tar.gz b/build-2011.03.29.tar.gz index 7f205834..1d8e64a4 100644 --- a/build-2011.03.29.tar.gz +++ b/build-2011.03.29.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9436cb4fe24a52e9fbe648daf1ff56b10da149f408d8c6ac66d8f692a85ea244 -size 264052 +oid sha256:1ae0cde5b38fecba0a55bfe736cc16f5f63ac5a1d41bda2befc4c3a0b8739f77 +size 265747 diff --git a/build.changes b/build.changes index cc2ec9ab..f32571aa 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 12 10:20:53 UTC 2011 - adrian@suse.de + +- conflict with old bsdtar (not supporting --chroot) + +------------------------------------------------------------------- +Wed Apr 27 12:34:17 UTC 2011 - adrian@suse.de + +- revert to single cpu build default for debian packages + ------------------------------------------------------------------- Tue Mar 29 14:59:28 UTC 2011 - lnussel@suse.de diff --git a/build.dsc b/build.dsc index af2c10c0..cade6700 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.01.20 +Version: 2011.03.29 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index c999226b..8319a48f 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.03.29 -Release: 1 +Version: 2011.03.29 +Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,9 +36,10 @@ Requires: bash Requires: perl Requires: binutils Requires: tar +Conflicts: bsdtar < 2.5.5 +%if 0%{?suse_version} > 1000 # 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) From fcf73d5114e10bcce6f21a155adfd2d7086bba92 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 25 May 2011 12:15:11 +0000 Subject: [PATCH 4/5] update Rev openSUSE:Tools/121 Md5 52a8be0d49f79e1de4eb66b1e0fa3cd8 2011-05-25 12:15:11 adrianSuSE None --- _service | 2 +- build-2011.03.29.tar.gz | 3 --- build-2011.05.24.tar.gz | 3 +++ build.changes | 5 +++++ build.dsc | 2 +- build.spec | 2 +- debian.tar.gz | 3 --- 7 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 build-2011.03.29.tar.gz create mode 100644 build-2011.05.24.tar.gz delete mode 100644 debian.tar.gz diff --git a/_service b/_service index 451c79ee..be8758d4 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 2011.03.29 + 2011.05.24 git://gitorious.org/opensuse/build.git git diff --git a/build-2011.03.29.tar.gz b/build-2011.03.29.tar.gz deleted file mode 100644 index 1d8e64a4..00000000 --- a/build-2011.03.29.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ae0cde5b38fecba0a55bfe736cc16f5f63ac5a1d41bda2befc4c3a0b8739f77 -size 265747 diff --git a/build-2011.05.24.tar.gz b/build-2011.05.24.tar.gz new file mode 100644 index 00000000..136ed7c7 --- /dev/null +++ b/build-2011.05.24.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:036b3b2158065127c2942267f370b3b440503efb3724bc0a653a03e4d85b83e6 +size 267240 diff --git a/build.changes b/build.changes index f32571aa..6b4a51a9 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 25 12:14:38 UTC 2011 - adrian@suse.de + +- allow to use simple spec file parser via Build::show + ------------------------------------------------------------------- Thu May 12 10:20:53 UTC 2011 - adrian@suse.de diff --git a/build.dsc b/build.dsc index cade6700..027f0a20 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2011.03.29 +Version: 2011.05.24 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 8319a48f..61c9cb15 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.03.29 +Version: 2011.05.24 Release: 0 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz 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 From 34d483b4c13dc6699e4e8dcea97cb00d5938f376 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 25 May 2011 12:55:17 +0000 Subject: [PATCH 5/5] where did it go ? Rev openSUSE:Tools/123 Md5 857c3b38df208f2882c9eadc7a8d8455 2011-05-25 12:55:17 adrianSuSE None --- debian.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian.tar.gz diff --git a/debian.tar.gz b/debian.tar.gz new file mode 100644 index 00000000..6ff99671 --- /dev/null +++ b/debian.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524