From db016809dd051bf66697ad7f0cdacc0236ce1038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 25 Feb 2010 08:24:40 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=73 --- build.changes | 5 +++++ build.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/build.changes b/build.changes index ddfbc5e3..abf171eb 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 25 08:21:03 UTC 2010 - adrian@suse.de + +- add requires to tar to fix debian builds + ------------------------------------------------------------------- Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de diff --git a/build.spec b/build.spec index e4d50959..5cb29acb 100644 --- a/build.spec +++ b/build.spec @@ -48,6 +48,7 @@ Requires: bash Requires: perl Requires: perl-TimeDate Requires: binutils +Requires: tar %description This package provides a script for building RPMs for SUSE Linux in a From 1c74389902e684a3d9d9cf7117b407d73c3799e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 25 Feb 2010 08:25:08 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=74 --- build-2010.02.19.tar.gz | 3 --- build-2010.02.25.tar.gz | 3 +++ build.changes | 4 ++-- build.dsc | 2 +- build.spec | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 build-2010.02.19.tar.gz create mode 100644 build-2010.02.25.tar.gz diff --git a/build-2010.02.19.tar.gz b/build-2010.02.19.tar.gz deleted file mode 100644 index 1767c32f..00000000 --- a/build-2010.02.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec61bd1966eef22cd22444dd753be2910cac3f8665a30fa8e264cef886f009f2 -size 99327 diff --git a/build-2010.02.25.tar.gz b/build-2010.02.25.tar.gz new file mode 100644 index 00000000..b037f240 --- /dev/null +++ b/build-2010.02.25.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2893908defec2e28c907e2557621d6664d5dc83c7595f5229a2d09d206bb2ff0 +size 99624 diff --git a/build.changes b/build.changes index abf171eb..b48e55ce 100644 --- a/build.changes +++ b/build.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu Feb 25 08:21:03 UTC 2010 - adrian@suse.de +Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de -- add requires to tar to fix debian builds +- add dependency to tar (needed for deb builds) ------------------------------------------------------------------- Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 68bdcf50..134e618e 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.02.19 +Version: 2010.02.25 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 5cb29acb..ace032fa 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: 2010.02.19 +Version: 2010.02.25 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") From 3c52f7d1c406c45c75e9d0e11d2414091fdfba84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 25 Feb 2010 08:26:05 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=75 --- build.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.changes b/build.changes index b48e55ce..58067ef6 100644 --- a/build.changes +++ b/build.changes @@ -2,6 +2,9 @@ Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de - add dependency to tar (needed for deb builds) +- use current git + * Added '--uid uid:gid' feature to specify abuild id in chroot + (by David Greaves) ------------------------------------------------------------------- Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de From ca2e1779c763463233cfa9469ae5fee629d612c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 8 Mar 2010 12:07:38 +0000 Subject: [PATCH 4/8] fix default.conf OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=76 --- build-2010.02.25.tar.gz | 3 --- build-2010.03.08.tar.gz | 3 +++ build.changes | 6 ++++++ build.spec | 12 ++++++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 build-2010.02.25.tar.gz create mode 100644 build-2010.03.08.tar.gz diff --git a/build-2010.02.25.tar.gz b/build-2010.02.25.tar.gz deleted file mode 100644 index b037f240..00000000 --- a/build-2010.02.25.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2893908defec2e28c907e2557621d6664d5dc83c7595f5229a2d09d206bb2ff0 -size 99624 diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz new file mode 100644 index 00000000..d4d63d3d --- /dev/null +++ b/build-2010.03.08.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b4590ef2f0c431dfe88b4f4e993e7634d699820f572d19f830bc1010273058a +size 100275 diff --git a/build.changes b/build.changes index 58067ef6..42e44115 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 8 12:07:03 UTC 2010 - adrian@suse.de + +- create default.conf symlink to correct *.conf based on + %suse_version and %sles_version macros + ------------------------------------------------------------------- Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de diff --git a/build.spec b/build.spec index ace032fa..c0cdcb08 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: 2010.02.25 +Version: 2010.03.08 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -63,7 +63,15 @@ chroot environment. %install make DESTDIR=$RPM_BUILD_ROOT install -#ln -s /usr/lib/build/build $RPM_BUILD_ROOT/usr/bin/build +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) From 9cc03db2daa32c9a8a92740b78a56c6d0ff139d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 8 Mar 2010 12:10:59 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=77 --- build-2010.03.08.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz index d4d63d3d..67eb1e4e 100644 --- a/build-2010.03.08.tar.gz +++ b/build-2010.03.08.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b4590ef2f0c431dfe88b4f4e993e7634d699820f572d19f830bc1010273058a -size 100275 +oid sha256:398c6cb2414a79a72677235e11736063b09cbf25b11c792a1fe3fd0de6df52fd +size 100257 From 583cfb5a11d9327e9ecb888040373287db57bfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 8 Mar 2010 12:13:35 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=78 --- build.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.dsc b/build.dsc index 134e618e..7b975595 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.02.25 +Version: 2010.03.08 Binary: build Maintainer: Adrian Schroeter Architecture: all From bc53b3b114a036f455c6a53de992da455a772416 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 9 Mar 2010 15:59:00 +0000 Subject: [PATCH 7/8] Accepting request 34401 from openSUSE:Tools checked in (request 34401) OBS-URL: https://build.opensuse.org/request/show/34401 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=79 --- build-2010.02.19.tar.gz | 3 +++ build-2010.03.08.tar.gz | 3 --- build.changes | 14 -------------- build.dsc | 2 +- build.spec | 13 ++----------- 5 files changed, 6 insertions(+), 29 deletions(-) create mode 100644 build-2010.02.19.tar.gz delete mode 100644 build-2010.03.08.tar.gz diff --git a/build-2010.02.19.tar.gz b/build-2010.02.19.tar.gz new file mode 100644 index 00000000..1767c32f --- /dev/null +++ b/build-2010.02.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec61bd1966eef22cd22444dd753be2910cac3f8665a30fa8e264cef886f009f2 +size 99327 diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz deleted file mode 100644 index 67eb1e4e..00000000 --- a/build-2010.03.08.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:398c6cb2414a79a72677235e11736063b09cbf25b11c792a1fe3fd0de6df52fd -size 100257 diff --git a/build.changes b/build.changes index 42e44115..ddfbc5e3 100644 --- a/build.changes +++ b/build.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Mon Mar 8 12:07:03 UTC 2010 - adrian@suse.de - -- create default.conf symlink to correct *.conf based on - %suse_version and %sles_version macros - -------------------------------------------------------------------- -Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de - -- add dependency to tar (needed for deb builds) -- use current git - * Added '--uid uid:gid' feature to specify abuild id in chroot - (by David Greaves) - ------------------------------------------------------------------- Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 7b975595..68bdcf50 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.03.08 +Version: 2010.02.19 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index c0cdcb08..e4d50959 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: 2010.03.08 +Version: 2010.02.19 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -48,7 +48,6 @@ Requires: bash Requires: perl Requires: perl-TimeDate Requires: binutils -Requires: tar %description This package provides a script for building RPMs for SUSE Linux in a @@ -63,15 +62,7 @@ chroot environment. %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 +#ln -s /usr/lib/build/build $RPM_BUILD_ROOT/usr/bin/build %files %defattr(-,root,root) From fb479a9925c99faa17521787009ed89fdd3dd5b3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 9 Mar 2010 15:59:01 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/build revision 26.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=c5e6bb1da825da385288b3218e3750f3 --- build-2010.02.19.tar.gz | 3 --- build-2010.03.08.tar.gz | 3 +++ build.changes | 14 ++++++++++++++ build.dsc | 2 +- build.spec | 15 ++++++++++++--- 5 files changed, 30 insertions(+), 7 deletions(-) delete mode 100644 build-2010.02.19.tar.gz create mode 100644 build-2010.03.08.tar.gz diff --git a/build-2010.02.19.tar.gz b/build-2010.02.19.tar.gz deleted file mode 100644 index 1767c32f..00000000 --- a/build-2010.02.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec61bd1966eef22cd22444dd753be2910cac3f8665a30fa8e264cef886f009f2 -size 99327 diff --git a/build-2010.03.08.tar.gz b/build-2010.03.08.tar.gz new file mode 100644 index 00000000..67eb1e4e --- /dev/null +++ b/build-2010.03.08.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:398c6cb2414a79a72677235e11736063b09cbf25b11c792a1fe3fd0de6df52fd +size 100257 diff --git a/build.changes b/build.changes index ddfbc5e3..42e44115 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Mar 8 12:07:03 UTC 2010 - adrian@suse.de + +- create default.conf symlink to correct *.conf based on + %suse_version and %sles_version macros + +------------------------------------------------------------------- +Thu Feb 25 08:22:52 UTC 2010 - adrian@suse.de + +- add dependency to tar (needed for deb builds) +- use current git + * Added '--uid uid:gid' feature to specify abuild id in chroot + (by David Greaves) + ------------------------------------------------------------------- Sat Feb 20 10:49:00 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 68bdcf50..7b975595 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.02.19 +Version: 2010.03.08 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index e4d50959..242b7b59 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.02.19) +# spec file for package build (Version 2010.03.08) # # 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.02.19 +Version: 2010.03.08 Release: 1 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -48,6 +48,7 @@ Requires: bash Requires: perl Requires: perl-TimeDate Requires: binutils +Requires: tar %description This package provides a script for building RPMs for SUSE Linux in a @@ -62,7 +63,15 @@ chroot environment. %install make DESTDIR=$RPM_BUILD_ROOT install -#ln -s /usr/lib/build/build $RPM_BUILD_ROOT/usr/bin/build +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)