From ea367eda577578291571967a27afa59266511071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 15 Oct 2010 10:25:51 +0000 Subject: [PATCH] Accepting request 50807 from openSUSE:Tools:Unstable okay ... OBS-URL: https://build.opensuse.org/request/show/50807 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=99 --- _service | 5 + ...recompress:tar_scm:build-2010.10.12.tar.gz | 3 + _service:set_version:build.dsc | 9 ++ _service:set_version:build.spec | 110 ++++++++++++++++++ build-2010.07.28.tar.gz | 3 - build.changes | 19 +++ build.dsc | 2 +- build.spec | 2 +- 8 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:build-2010.10.12.tar.gz create mode 100644 _service:set_version:build.dsc create mode 100644 _service:set_version:build.spec delete mode 100644 build-2010.07.28.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..749bda5 --- /dev/null +++ b/_service @@ -0,0 +1,5 @@ + + 2010.10.12git://gitorious.org/opensuse/build.gitgit +gz*.tar + + diff --git a/_service:recompress:tar_scm:build-2010.10.12.tar.gz b/_service:recompress:tar_scm:build-2010.10.12.tar.gz new file mode 100644 index 0000000..b2680c2 --- /dev/null +++ b/_service:recompress:tar_scm:build-2010.10.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f04a2e2a6a2a0b45b8dcf1c82f694a50d581f5f6baaec4d0da664787bec9579 +size 582481 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc new file mode 100644 index 0000000..2eda7b7 --- /dev/null +++ b/_service:set_version:build.dsc @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000..ddb971e --- /dev/null +++ b/_service:set_version:build.spec @@ -0,0 +1,110 @@ +# +# 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/build-2010.07.28.tar.gz b/build-2010.07.28.tar.gz deleted file mode 100644 index ba2f7aa..0000000 --- a/build-2010.07.28.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c55641402fdfe7e7796a0fadcacfbc78cec97124da017e3d9897003e71ff38bd -size 99969 diff --git a/build.changes b/build.changes index c3b794a..1c00131 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Sep 21 13:23:00 UTC 2010 - adrian@suse.de + +- update to current git + * workaround for supporting rpm install on cross build with native + acceleration + +------------------------------------------------------------------- +Tue Aug 24 08:32:05 UTC 2010 - adrian@suse.de + +- update to current git + * support for mips cross build + +------------------------------------------------------------------- +Wed Aug 4 15:31:41 UTC 2010 - adrian@suse.de + +- update to current git + * replace release number macros with 0 if not specified + ------------------------------------------------------------------- Wed Jul 28 15:44:41 CEST 2010 - mls@suse.de diff --git a/build.dsc b/build.dsc index 2d96552..f8a206a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.07.28 +Version: 2010.08.23 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 6f3d9bd..f71fe73 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.07.28 +Version: 2010.08.23 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")