diff --git a/_service b/_service new file mode 100644 index 0000000..8038e12 --- /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 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..41c94ea 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 2d96552..2eda7b7 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 6f3d9bd..abb06bd 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