From e338a5c36d568d27fb809321ed33dafa1f4b5220 Mon Sep 17 00:00:00 2001 From: OBS User coolo Date: Thu, 28 Oct 2010 16:02:11 +0000 Subject: [PATCH] Rev openSUSE:Factory/40 Md5 880d7806e73bfeeccea90ade271f61de 2010-10-28 16:02:11 coolo None --- _service | 5 + ...recompress:tar_scm:build-2010.10.27.tar.gz | 3 + _service:set_version:build.dsc | 9 ++ _service:set_version:build.spec | 127 ++++++++++++++++++ build-2010.10.12.tar.gz | 3 - build.changes | 19 +++ build.spec | 47 ++++--- 7 files changed, 195 insertions(+), 18 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:build-2010.10.27.tar.gz create mode 100644 _service:set_version:build.dsc create mode 100644 _service:set_version:build.spec delete mode 100644 build-2010.10.12.tar.gz diff --git a/_service b/_service new file mode 100644 index 00000000..d4cc1d73 --- /dev/null +++ b/_service @@ -0,0 +1,5 @@ + + 2010.10.27git://gitorious.org/opensuse/build.gitgit +gz*.tar + + diff --git a/_service:recompress:tar_scm:build-2010.10.27.tar.gz b/_service:recompress:tar_scm:build-2010.10.27.tar.gz new file mode 100644 index 00000000..3470bdfc --- /dev/null +++ b/_service:recompress:tar_scm:build-2010.10.27.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cf40c69734dffec51742149981a377d483d9ecb02b5585e307fc2af24bf3b68 +size 581916 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc new file mode 100644 index 00000000..07cb2676 --- /dev/null +++ b/_service:set_version:build.dsc @@ -0,0 +1,9 @@ +Format: 1.0 +Source: build +Version: 2010.10.27 +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 00000000..364dc0cb --- /dev/null +++ b/_service:set_version:build.spec @@ -0,0 +1,127 @@ +# +# spec file for package build (Version 2010.10.12) +# +# 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.27 +Release: 1 +#!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: binutils +Requires: tar +# None of them are actually required for core features. +# Perl helper scripts use them. +%if 0%{?suse_version} +Recommends: perl(Date::Language) +Recommends: perl(Date::Parse) +Recommends: perl(LWP::UserAgent) +Recommends: perl(Pod::Usage) +Recommends: perl(Time::Zone) +Recommends: perl(URI) +Recommends: perl(XML::Parser) +%endif + +%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 +Recommends: build-mkdrpms + +%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. + +%package mkdrpms +License: GPLv2+ +Group: Development/Tools/Building +Summary: Tools to generate delta rpms +Requires: deltarpm +# XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq +Requires: build + +%description mkdrpms +This package contains the parts which may be installed in the inner build system +for generating delta rpm 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* +%exclude /usr/lib/build/mkdrpms + +%files mkbaselibs +%defattr(-,root,root) +%dir /usr/lib/build +/usr/lib/build/mkbaselibs +/usr/lib/build/baselibs* + +%files mkdrpms +%defattr(-,root,root) +%dir /usr/lib/build +/usr/lib/build/mkdrpms +%endif + +%changelog diff --git a/build-2010.10.12.tar.gz b/build-2010.10.12.tar.gz deleted file mode 100644 index b2680c21..00000000 --- a/build-2010.10.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f04a2e2a6a2a0b45b8dcf1c82f694a50d581f5f6baaec4d0da664787bec9579 -size 582481 diff --git a/build.changes b/build.changes index 025dd8f0..cadfe618 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 27 13:38:48 UTC 2010 - lnussel@suse.de + +- use '.drpm' suffix instead of '.delta.rpm' for delta rpms +- makedeltarpms -> mkdrpms and also rename subpackage to match + script name +- since mkdrpms needs Build.pm make perl-TimeDate dependency of + build optional + +------------------------------------------------------------------- +Mon Oct 18 14:38:16 UTC 2010 - lnussel@suse.de + +- add missing optional perl dependencies + ------------------------------------------------------------------- Fri Oct 15 10:27:08 UTC 2010 - adrian@suse.de @@ -14,6 +28,11 @@ Tue Sep 21 13:23:00 UTC 2010 - adrian@suse.de * workaround for supporting rpm install on cross build with native acceleration +------------------------------------------------------------------- +Mon Sep 20 12:25:56 UTC 2010 - lnussel@suse.de + +- package mkdrpms script in separate package + ------------------------------------------------------------------- Tue Aug 24 08:32:05 UTC 2010 - adrian@suse.de diff --git a/build.spec b/build.spec index 56d8ed62..517d99eb 100644 --- a/build.spec +++ b/build.spec @@ -23,21 +23,8 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.10.12 +Version: 2010.10.27 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 @@ -47,9 +34,19 @@ AutoReqProv: off # Keep the following dependencies in sync with obs-worker package Requires: bash Requires: perl -Requires: perl-TimeDate Requires: binutils Requires: tar +# None of them are actually required for core features. +# Perl helper scripts use them. +%if 0%{?suse_version} +Recommends: perl(Date::Language) +Recommends: perl(Date::Parse) +Recommends: perl(LWP::UserAgent) +Recommends: perl(Pod::Usage) +Recommends: perl(Time::Zone) +Recommends: perl(URI) +Recommends: perl(XML::Parser) +%endif %description This package provides a script for building RPMs for SUSE Linux in a @@ -58,6 +55,7 @@ chroot environment. %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} Requires: build-mkbaselibs +Recommends: build-mkdrpms %package mkbaselibs License: GPLv2+ @@ -68,6 +66,19 @@ Summary: Tools to generate base lib packages %description mkbaselibs This package contains the parts which may be installed in the inner build system for generating base lib packages. + +%package mkdrpms +License: GPLv2+ +Group: Development/Tools/Building +Summary: Tools to generate delta rpms +Requires: deltarpm +# XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq +Requires: build + +%description mkdrpms +This package contains the parts which may be installed in the inner build system +for generating delta rpm packages. + %endif %prep @@ -99,12 +110,18 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/ %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} %exclude /usr/lib/build/mkbaselibs %exclude /usr/lib/build/baselibs* +%exclude /usr/lib/build/mkdrpms %files mkbaselibs %defattr(-,root,root) %dir /usr/lib/build /usr/lib/build/mkbaselibs /usr/lib/build/baselibs* + +%files mkdrpms +%defattr(-,root,root) +%dir /usr/lib/build +/usr/lib/build/mkdrpms %endif %changelog