diff --git a/_service b/_service deleted file mode 100644 index 749bda5..0000000 --- a/_service +++ /dev/null @@ -1,5 +0,0 @@ - - 2010.10.12git://gitorious.org/opensuse/build.gitgit -gz*.tar - - diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc deleted file mode 100644 index 2eda7b7..0000000 --- a/_service:set_version:build.dsc +++ /dev/null @@ -1,9 +0,0 @@ -Format: 1.0 -Source: build -Version: 2010.10.12 -Binary: build -Maintainer: Adrian Schroeter -Architecture: all -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4) - diff --git a/_service:set_version:build.spec b/_service:set_version:build.spec deleted file mode 100644 index ddb971e..0000000 --- a/_service:set_version:build.spec +++ /dev/null @@ -1,110 +0,0 @@ -# -# spec file for package build (Version 2010.07.28) -# -# Copyright (c) 2010 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - - -Name: build -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -Summary: A Script to Build SUSE Linux RPMs -Version: 2010.10.12 -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") -# VERSION="$(date +"%Y.%m.%d").r$REVISION" -# svn export -r$REVISION https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build build-$VERSION -# tar cjvf build-$VERSION.tar.bz2 build-$VERSION -# rm -rf build-$VERSION -# osc add build-$VERSION.tar.bz2 -# # There's several occurences of "Version: something" in this file, -# # two of them valid, so we need to be picky in the match. -# sed --in-place build.spec -e"/\(Version:\?[[:space:]]\+\)\([0-9]\{4\}\.[0-9][0-9]\.[0-9][0-9]\.r[0-9]\+\)/s,,\1$VERSION," -# osc build build.spec -# osc ci -# osc submitreq create -m"current svn snapshot." openSUSE:Tools build openSUSE:Factory -#!BuildIgnore: build-mkbaselibs -Source: build-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -# Manual requires to avoid hard require to bash-static -AutoReqProv: off -# Keep the following dependencies in sync with obs-worker package -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 -chroot environment. - - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -Requires: build-mkbaselibs - -%package mkbaselibs -License: GPLv2+ -Group: Development/Tools/Building -Summary: Tools to generate base lib packages -# NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules) - -%description mkbaselibs -This package contains the parts which may be installed in the inner build system -for generating base lib packages. -%endif - -%prep -%setup -q - -%build - -%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 - -%files -%defattr(-,root,root) -%doc README -/usr/bin/build -/usr/bin/buildvc -/usr/bin/unrpm -/usr/lib/build -%{_mandir}/man1/build.1* - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -%exclude /usr/lib/build/mkbaselibs -%exclude /usr/lib/build/baselibs* - -%files mkbaselibs -%defattr(-,root,root) -%dir /usr/lib/build -/usr/lib/build/mkbaselibs -/usr/lib/build/baselibs* -%endif - -%changelog diff --git a/_service:recompress:tar_scm:build-2010.10.12.tar.gz b/build-2010.10.12.tar.gz similarity index 100% rename from _service:recompress:tar_scm:build-2010.10.12.tar.gz rename to build-2010.10.12.tar.gz diff --git a/build.changes b/build.changes index 1c00131..025dd8f 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Oct 15 10:27:08 UTC 2010 - adrian@suse.de + +- update to current git + * export also fallback archs as exclusive archs for kiwi product + building, fixes factory dvd5 64bit media + * cross build fixes by Martin Mohring + * correct disk image file creation, it was one byte too large by James Perkins + ------------------------------------------------------------------- Tue Sep 21 13:23:00 UTC 2010 - adrian@suse.de diff --git a/build.dsc b/build.dsc index f8a206a..2eda7b7 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.08.23 +Version: 2010.10.12 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index f71fe73..ddb971e 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.08.23 +Version: 2010.10.12 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")