From d51b8cc9ab070d98e2b59477172f7fca0cee5854 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 10 Mar 2010 15:12:24 +0000 Subject: [PATCH] Copy from openSUSE:Tools:Unstable/build via accept of submit request 34518 revision 16. Request was accepted with message: thanks Rev openSUSE:Tools/80 Md5 4e200443193d771f584dc4b5191153a0 2010-03-10 15:12:24 adrianSuSE 34518 --- build-2010.02.19.tar.gz | 3 --- build-2010.03.10.tar.gz | 3 +++ build.changes | 20 ++++++++++++++++++++ build.dsc | 2 +- build.spec | 15 ++++++++++++--- 5 files changed, 36 insertions(+), 7 deletions(-) delete mode 100644 build-2010.02.19.tar.gz create mode 100644 build-2010.03.10.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.10.tar.gz b/build-2010.03.10.tar.gz new file mode 100644 index 00000000..b77d6834 --- /dev/null +++ b/build-2010.03.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd453f04ffe9062b8cc182109e3d278ea9f6d7e61d9634a717f8452fd20e6de2 +size 100529 diff --git a/build.changes b/build.changes index ddfbc5e3..50a63839 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Mar 10 13:34:45 UTC 2010 - adrian@suse.de + +- update to current git + * Kiwi exclude arch handling + +------------------------------------------------------------------- +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..c839bc2d 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.02.19 +Version: 2010.03.10 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index e4d50959..3dcd1bf7 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.10 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)