From d689fab0a38a97504b30da876f71733437cb6296 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 14:45:37 +0000 Subject: [PATCH 1/8] checked in (request 50809) Rev openSUSE:Tools/101 Md5 8de0397300f965cb42c1cbcb62d0a750 2010-10-15 14:45:37 autobuild 50809 --- build-2010.07.28.tar.gz | 3 +++ build-2010.10.12.tar.gz | 3 --- build.changes | 28 ---------------------------- build.dsc | 2 +- build.spec | 2 +- 5 files changed, 5 insertions(+), 33 deletions(-) create mode 100644 build-2010.07.28.tar.gz delete mode 100644 build-2010.10.12.tar.gz diff --git a/build-2010.07.28.tar.gz b/build-2010.07.28.tar.gz new file mode 100644 index 00000000..ba2f7aae --- /dev/null +++ b/build-2010.07.28.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c55641402fdfe7e7796a0fadcacfbc78cec97124da017e3d9897003e71ff38bd +size 99969 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..c3b794ac 100644 --- a/build.changes +++ b/build.changes @@ -1,31 +1,3 @@ -------------------------------------------------------------------- -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 - -- 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 2eda7b74..2d965524 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.10.12 +Version: 2010.07.28 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index ddb971e7..6f3d9bdb 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.10.12 +Version: 2010.07.28 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") From 43a15e905d7452f32376bc979ad98e4112bb4f08 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 11 Nov 2010 12:26:23 +0000 Subject: [PATCH 2/8] update for Ubuntu 10.10 Rev openSUSE:Tools/102 Md5 bfeef876f5c51ba3cb98aca93b0d7944 2010-11-11 12:26:23 adrianSuSE None --- _service | 5 ++++ build-2010.07.28.tar.gz | 3 --- build.changes | 58 +++++++++++++++++++++++++++++++++++++++++ build.dsc | 2 +- build.spec | 49 ++++++++++++++++++++++------------ 5 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 _service delete mode 100644 build-2010.07.28.tar.gz diff --git a/_service b/_service new file mode 100644 index 00000000..8038e121 --- /dev/null +++ b/_service @@ -0,0 +1,5 @@ + + 2010.11.11git://gitorious.org/opensuse/build.gitgit +gz*.tar + + diff --git a/build-2010.07.28.tar.gz b/build-2010.07.28.tar.gz deleted file mode 100644 index ba2f7aae..00000000 --- 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 c3b794ac..41c94ea1 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de + +- workaround for distros with appstart like Ubuntu 10.10 + +------------------------------------------------------------------- +Tue Nov 2 16:32:42 UTC 2010 - lnussel@suse.de + +- delta size limit 80% +- actually unlink the delta file if the delta is too big + +------------------------------------------------------------------- +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 + +- 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 + +- update to current git + * 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 + +- 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 2d965524..2eda7b74 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.07.28 +Version: 2010.10.12 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 6f3d9bdb..abb06bd6 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.07.28) +# spec file for package build (Version 2010.10.12) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,21 +23,8 @@ License: GPLv2+ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.07.28 +Version: 2010.11.02 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 From 6e1b9059623797f8845fe65df331dd1caf58217f Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Thu, 11 Nov 2010 13:38:13 +0000 Subject: [PATCH 3/8] generated via source service Rev openSUSE:Tools/103 Md5 358afe63ead0fd23b1e217c52c4e5e3a 2010-11-11 13:38:13 _service None --- ...recompress:tar_scm:build-2010.11.11.tar.gz | 3 + _service:set_version:build.dsc | 9 ++ _service:set_version:build.spec | 127 ++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 _service:recompress:tar_scm:build-2010.11.11.tar.gz create mode 100644 _service:set_version:build.dsc create mode 100644 _service:set_version:build.spec diff --git a/_service:recompress:tar_scm:build-2010.11.11.tar.gz b/_service:recompress:tar_scm:build-2010.11.11.tar.gz new file mode 100644 index 00000000..fec610bf --- /dev/null +++ b/_service:recompress:tar_scm:build-2010.11.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4be0b9715be2d2818e94096de890abe1e278ff123179ece522e9d642127355d6 +size 585253 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc new file mode 100644 index 00000000..036e984c --- /dev/null +++ b/_service:set_version:build.dsc @@ -0,0 +1,9 @@ +Format: 1.0 +Source: build +Version: 2010.11.11 +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..8e75567a --- /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.11.11 +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 From f130404ba3b752c6083dc989d6748793b213571a Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Thu, 11 Nov 2010 14:10:43 +0000 Subject: [PATCH 4/8] generated via source service Rev openSUSE:Tools/104 Md5 2b133a3bc6b6f6e9e4a0769475f9e0d1 2010-11-11 14:10:43 _service None --- _service:recompress:tar_scm:build-2010.11.11.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_service:recompress:tar_scm:build-2010.11.11.tar.gz b/_service:recompress:tar_scm:build-2010.11.11.tar.gz index fec610bf..0d1452a0 100644 --- a/_service:recompress:tar_scm:build-2010.11.11.tar.gz +++ b/_service:recompress:tar_scm:build-2010.11.11.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4be0b9715be2d2818e94096de890abe1e278ff123179ece522e9d642127355d6 -size 585253 +oid sha256:41ca2c05d510c54bbab6e0ef38c04ba37b1d2bc1c380b53c0ccf4487fe880a6c +size 585649 From 4b6e235524e6844447dd66acad311c2b2437eb79 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 11 Nov 2010 15:35:10 +0000 Subject: [PATCH 5/8] fix build for SLES 9 Rev openSUSE:Tools/105 Md5 8c69613151e22d192ca7590e004ae13b 2010-11-11 15:35:10 adrianSuSE None --- ...recompress:tar_scm:build-2010.11.11.tar.gz | 3 - _service:set_version:build.dsc | 9 -- _service:set_version:build.spec | 127 ------------------ build.spec | 2 +- 4 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 _service:recompress:tar_scm:build-2010.11.11.tar.gz delete mode 100644 _service:set_version:build.dsc delete mode 100644 _service:set_version:build.spec diff --git a/_service:recompress:tar_scm:build-2010.11.11.tar.gz b/_service:recompress:tar_scm:build-2010.11.11.tar.gz deleted file mode 100644 index 0d1452a0..00000000 --- a/_service:recompress:tar_scm:build-2010.11.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41ca2c05d510c54bbab6e0ef38c04ba37b1d2bc1c380b53c0ccf4487fe880a6c -size 585649 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc deleted file mode 100644 index 036e984c..00000000 --- a/_service:set_version:build.dsc +++ /dev/null @@ -1,9 +0,0 @@ -Format: 1.0 -Source: build -Version: 2010.11.11 -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 8e75567a..00000000 --- a/_service:set_version:build.spec +++ /dev/null @@ -1,127 +0,0 @@ -# -# 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.11.11 -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.spec b/build.spec index abb06bd6..a0878947 100644 --- a/build.spec +++ b/build.spec @@ -38,7 +38,7 @@ Requires: binutils Requires: tar # None of them are actually required for core features. # Perl helper scripts use them. -%if 0%{?suse_version} +%if 0%{?suse_version} > 1000 Recommends: perl(Date::Language) Recommends: perl(Date::Parse) Recommends: perl(LWP::UserAgent) From b951b39acd57c8a6ed5df73b20bf3394a167854a Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Fri, 12 Nov 2010 17:57:25 +0000 Subject: [PATCH 6/8] generated via source service Rev openSUSE:Tools/106 Md5 d1844b22c523a3bb9a76ff7b00470291 2010-11-12 17:57:25 _service None --- ...recompress:tar_scm:build-2010.11.11.tar.gz | 3 + _service:set_version:build.dsc | 9 ++ _service:set_version:build.spec | 127 ++++++++++++++++++ build.spec | 2 +- 4 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 _service:recompress:tar_scm:build-2010.11.11.tar.gz create mode 100644 _service:set_version:build.dsc create mode 100644 _service:set_version:build.spec diff --git a/_service:recompress:tar_scm:build-2010.11.11.tar.gz b/_service:recompress:tar_scm:build-2010.11.11.tar.gz new file mode 100644 index 00000000..8f12bcd5 --- /dev/null +++ b/_service:recompress:tar_scm:build-2010.11.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2fa923db70423085ee8ea1d4e0b2d6f323982734ab67b1a52a1bea9586164c3 +size 585621 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc new file mode 100644 index 00000000..036e984c --- /dev/null +++ b/_service:set_version:build.dsc @@ -0,0 +1,9 @@ +Format: 1.0 +Source: build +Version: 2010.11.11 +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..2ffcb6f3 --- /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.11.11 +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} > 1000 +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.spec b/build.spec index a0878947..ae26d6cb 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.10.12) +# spec file for package build (Version 2010.11.02) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # From 5dc4dbd458867b3c0f03a52dd63e38c1dfde5a04 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 9 Dec 2010 14:52:49 +0000 Subject: [PATCH 7/8] update to current git Rev openSUSE:Tools/107 Md5 2055ed879d1b0e731ef050dd1d9ea055 2010-12-09 14:52:49 adrianSuSE None --- _service | 2 +- ...recompress:tar_scm:build-2010.11.11.tar.gz | 3 - _service:set_version:build.dsc | 9 -- _service:set_version:build.spec | 127 ------------------ build.changes | 8 ++ build.spec | 3 +- 6 files changed, 11 insertions(+), 141 deletions(-) delete mode 100644 _service:recompress:tar_scm:build-2010.11.11.tar.gz delete mode 100644 _service:set_version:build.dsc delete mode 100644 _service:set_version:build.spec diff --git a/_service b/_service index 8038e121..f6b85760 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - 2010.11.11git://gitorious.org/opensuse/build.gitgit + 2010.12.09git://gitorious.org/opensuse/build.gitgit gz*.tar diff --git a/_service:recompress:tar_scm:build-2010.11.11.tar.gz b/_service:recompress:tar_scm:build-2010.11.11.tar.gz deleted file mode 100644 index 8f12bcd5..00000000 --- a/_service:recompress:tar_scm:build-2010.11.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2fa923db70423085ee8ea1d4e0b2d6f323982734ab67b1a52a1bea9586164c3 -size 585621 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc deleted file mode 100644 index 036e984c..00000000 --- a/_service:set_version:build.dsc +++ /dev/null @@ -1,9 +0,0 @@ -Format: 1.0 -Source: build -Version: 2010.11.11 -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 2ffcb6f3..00000000 --- a/_service:set_version:build.spec +++ /dev/null @@ -1,127 +0,0 @@ -# -# 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.11.11 -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} > 1000 -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.changes b/build.changes index 41c94ea1..69271c9e 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 9 11:51:40 UTC 2010 - adrian@suse.de + +- support bsdtar for setting up build enviroment +- make expanddeps use the highest version of a package if multiple + versions aver available in a repository [bnc#656599] +- support other file formats (esp. for .ZIP and .EXE export for crossbuild) + ------------------------------------------------------------------- Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de diff --git a/build.spec b/build.spec index ae26d6cb..a2cd7ff8 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.11.02 +Version: 2010.12.09 Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz @@ -46,6 +46,7 @@ Recommends: perl(Pod::Usage) Recommends: perl(Time::Zone) Recommends: perl(URI) Recommends: perl(XML::Parser) +Recommends: bsdtar %endif %description From 8fe8b0d6269e0397e07192c8df8e1bd82400aabd Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Thu, 9 Dec 2010 14:53:04 +0000 Subject: [PATCH 8/8] generated via source service Rev openSUSE:Tools/108 Md5 31b085a4a9558f00bfd589994317ffdc 2010-12-09 14:53:04 _service None --- ...recompress:tar_scm:build-2010.12.09.tar.gz | 3 + _service:set_version:build.dsc | 9 ++ _service:set_version:build.spec | 128 ++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 _service:recompress:tar_scm:build-2010.12.09.tar.gz create mode 100644 _service:set_version:build.dsc create mode 100644 _service:set_version:build.spec diff --git a/_service:recompress:tar_scm:build-2010.12.09.tar.gz b/_service:recompress:tar_scm:build-2010.12.09.tar.gz new file mode 100644 index 00000000..3f74f0dc --- /dev/null +++ b/_service:recompress:tar_scm:build-2010.12.09.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e53c56ba2928ae365c08df7465c1941d28b37e7c51dcf8c3e71be6fdc80d67e9 +size 589661 diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc new file mode 100644 index 00000000..5ef22684 --- /dev/null +++ b/_service:set_version:build.dsc @@ -0,0 +1,9 @@ +Format: 1.0 +Source: build +Version: 2010.12.09 +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..e9ecc213 --- /dev/null +++ b/_service:set_version:build.spec @@ -0,0 +1,128 @@ +# +# spec file for package build (Version 2010.11.02) +# +# 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.12.09 +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} > 1000 +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) +Recommends: bsdtar +%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