update to current git

Rev openSUSE:Tools/107 Md5 2055ed879d1b0e731ef050dd1d9ea055 2010-12-09 14:52:49 adrianSuSE None
This commit is contained in:
OBS User adrianSuSE 2010-12-09 14:52:49 +00:00 committed by Git OBS Bridge
parent b951b39acd
commit 5dc4dbd458
6 changed files with 11 additions and 141 deletions

View File

@ -1,5 +1,5 @@
<services> <services>
<service name="tar_scm"><param name="version">2010.11.11</param><param name="url">git://gitorious.org/opensuse/build.git</param><param name="scm">git</param></service> <service name="tar_scm"><param name="version">2010.12.09</param><param name="url">git://gitorious.org/opensuse/build.git</param><param name="scm">git</param></service>
<service name="recompress"><param name="compression">gz</param><param name="file">*.tar</param></service> <service name="recompress"><param name="compression">gz</param><param name="file">*.tar</param></service>
<service name="set_version"/> <service name="set_version"/>
</services> </services>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a2fa923db70423085ee8ea1d4e0b2d6f323982734ab67b1a52a1bea9586164c3
size 585621

View File

@ -1,9 +0,0 @@
Format: 1.0
Source: build
Version: 2010.11.11
Binary: build
Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: all
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4)

View File

@ -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

View File

@ -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 Thu Nov 11 12:24:13 UTC 2010 - adrian@suse.de

View File

@ -23,7 +23,7 @@ License: GPLv2+
Group: Development/Tools/Building Group: Development/Tools/Building
AutoReqProv: on AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs Summary: A Script to Build SUSE Linux RPMs
Version: 2010.11.02 Version: 2010.12.09
Release: 1 Release: 1
#!BuildIgnore: build-mkbaselibs #!BuildIgnore: build-mkbaselibs
Source: build-%{version}.tar.gz Source: build-%{version}.tar.gz
@ -46,6 +46,7 @@ Recommends: perl(Pod::Usage)
Recommends: perl(Time::Zone) Recommends: perl(Time::Zone)
Recommends: perl(URI) Recommends: perl(URI)
Recommends: perl(XML::Parser) Recommends: perl(XML::Parser)
Recommends: bsdtar
%endif %endif
%description %description