From 434ee4c342f9f3586f05cd1a40fa76a66af36b41 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 22 Apr 2009 08:21:51 +0000 Subject: [PATCH] Rev openSUSE:Tools/42 Md5 9ef213235fb9e41bdea480277e36f7b2 2009-04-22 08:21:51 adrianSuSE None --- build-2009.04.20.tar.gz | 3 --- build-2009.04.22.tar.gz | 3 +++ build.changes | 8 ++++++++ build.dsc | 2 +- build.spec | 20 ++++++++------------ 5 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 build-2009.04.20.tar.gz create mode 100644 build-2009.04.22.tar.gz diff --git a/build-2009.04.20.tar.gz b/build-2009.04.20.tar.gz deleted file mode 100644 index 0b7d3660..00000000 --- a/build-2009.04.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:081893918e37bd0d179f86f99689d7f922df8d2432d9bf5edcbebcae24043ab4 -size 76315 diff --git a/build-2009.04.22.tar.gz b/build-2009.04.22.tar.gz new file mode 100644 index 00000000..823237a6 --- /dev/null +++ b/build-2009.04.22.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e672d8e9c53a2c2b568246fd0b965c7f785b07697dda365f6887de9397b1428a +size 76177 diff --git a/build.changes b/build.changes index 6ca06339..931ed995 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 22 10:18:58 CEST 2009 - adrian@suse.de + +- update to current svn (r7137) + * package vc tool correctly + * avoid running fsck on vm instances after 23 build runs +- install files via Makefile instead of manual calls in spec file + ------------------------------------------------------------------- Mon Apr 20 14:48:41 CEST 2009 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 990cd15e..85ac272f 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2009.04.20 +Version: 2009.04.22 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 2ffcb530..6099dc6a 100644 --- a/build.spec +++ b/build.spec @@ -23,7 +23,7 @@ License: GPL v2 or later Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2009.04.20 +Version: 2009.04.22 Release: 2 # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") @@ -41,6 +41,10 @@ Release: 2 Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +# Manual requires to avoid hard require to bash-static +Autoreqprov: off +Requires: /bin/bash +Requires: /usr/bin/perl %description This package provides a script for building RPMs for SUSE Linux in a @@ -53,22 +57,14 @@ chroot environment. %build %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,lib/build,lib/build/configs,lib/build/Build,share/man/man1} -cp -a unrpm $RPM_BUILD_ROOT/usr/bin -cp -a Build.pm build createrpmdeps computeblocklists order getbinaryid expanddeps extractbuild \ - getmacros getoptflags init_buildsystem substitutedeps $RPM_BUILD_ROOT/usr/lib/build/ -cp -a changelog2spec debtransform createrepomddeps createyastdeps killchroot \ - $RPM_BUILD_ROOT/usr/lib/build/ -cp -a configs/* $RPM_BUILD_ROOT/usr/lib/build/configs -cp -a Build/* $RPM_BUILD_ROOT/usr/lib/build/Build -cp -a mkbaselibs baselibs_global.conf $RPM_BUILD_ROOT/usr/lib/build/ -cp -a build.1 $RPM_BUILD_ROOT/usr/share/man/man1 -ln -s /usr/lib/build/build $RPM_BUILD_ROOT/usr/bin/build +make DESTDIR=$RPM_BUILD_ROOT install +#ln -s /usr/lib/build/build $RPM_BUILD_ROOT/usr/bin/build %files %defattr(-,root,root) %doc README /usr/bin/build +/usr/bin/buildvc /usr/bin/unrpm /usr/lib/build %{_mandir}/man1/build.1*