From 9953d052ffd445af2651b1fe5472646a47e1254e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 28 Feb 2011 14:15:28 +0000 Subject: [PATCH 1/6] Updating link to change in openSUSE:Factory/build revision 49.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=a93061cce5fa0eaafc0b1114f028d7c6 --- build.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.spec b/build.spec index 237c276..b4d8b83 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 From ddfc10c1bc95e4407594ab9c19bbee5546770dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 1 Mar 2011 15:36:09 +0000 Subject: [PATCH 2/6] fix xen build OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=115 --- build-2011.01.20.tar.gz | 4 ++-- build.changes | 5 +++++ debian.tar.gz | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 debian.tar.gz diff --git a/build-2011.01.20.tar.gz b/build-2011.01.20.tar.gz index 9f2c858..e296a61 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 70dec5f..f325397 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/debian.tar.gz b/debian.tar.gz new file mode 100644 index 0000000..6ff9967 --- /dev/null +++ b/debian.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524 From 1d2d6dfb532b302fedbbd362a402ea7e31eb13de Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 29 Mar 2011 15:32:18 +0000 Subject: [PATCH 3/6] - make sure default.conf is no stale symlink OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=117 --- _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 6ab4512..451c79e 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 e296a61..0000000 --- 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 0000000..7f20583 --- /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 f325397..cc2ec9a 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 b4d8b83..c999226 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 882a3b471686d05835b1449bb20b2bf90903ad1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 12 May 2011 10:21:16 +0000 Subject: [PATCH 4/6] add conflict OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=119 --- 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 7f20583..1d8e64a 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 cc2ec9a..f32571a 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 af2c10c..cade670 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 c999226..8319a48 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 444a42019356c9df75362c3c001e5fd8ccda1e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 May 2011 12:15:11 +0000 Subject: [PATCH 5/6] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=121 --- _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 451c79e..be8758d 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 1d8e64a..0000000 --- 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 0000000..136ed7c --- /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 f32571a..6b4a51a 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 cade670..027f0a2 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 8319a48..61c9cb1 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 6ff9967..0000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 -size 1524 From 91a214b763aa832ac09cb90e7d9c495dc9f70fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 May 2011 12:55:17 +0000 Subject: [PATCH 6/6] where did it go ? OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=123 --- 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 0000000..6ff9967 --- /dev/null +++ b/debian.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524