CONFLICT Accepting request 63012: Accepted submit request 63012 from user adrianSuSE
Rev openSUSE:Factory/48 Md5 cab81a4ab2a894da14787cc2c4433cf1 2011-02-28 14:15:18 saschpe 63012
This commit is contained in:
OBS User saschpe
Git OBS Bridge
commit
a028e2eb7c
13
_service
13
_service
@ -1,5 +1,12 @@
|
||||
<services>
|
||||
<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="set_version"/>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="version">2011.01.20</param>
|
||||
<param name="url">git://gitorious.org/opensuse/build.git</param>
|
||||
<param name="scm">git</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="compression">gz</param>
|
||||
<param name="file">*.tar</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e53c56ba2928ae365c08df7465c1941d28b37e7c51dcf8c3e71be6fdc80d67e9
|
||||
size 589661
|
||||
@ -1,9 +0,0 @@
|
||||
Format: 1.0
|
||||
Source: build
|
||||
Version: 2010.12.09
|
||||
Binary: build
|
||||
Maintainer: Adrian Schroeter <adrian@suse.de>
|
||||
Architecture: all
|
||||
Standards-Version: 3.7.2
|
||||
Build-Depends: debhelper (>= 4)
|
||||
|
||||
@ -1,128 +0,0 @@
|
||||
#
|
||||
# spec file for package build (Version 2010.12.09)
|
||||
#
|
||||
# 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
|
||||
3
build-2011.01.20.tar.gz
Normal file
3
build-2011.01.20.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6c85b5caf6d889df5654451289adda478442208a0be5d77bc5509f645bf8f342
|
||||
size 251392
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 28 09:02:32 UTC 2011 - adrian@suse.de
|
||||
|
||||
- do not use current git branch for stable build package in distributions
|
||||
- require bsdtar for vm builds to ensure a safe build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 15 14:05:09 CET 2010 - mls@suse.de
|
||||
|
||||
- also use -o when using bsdtar --chroot
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 9 11:51:40 UTC 2010 - adrian@suse.de
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Format: 1.0
|
||||
Source: build
|
||||
Version: 2010.10.12
|
||||
Version: 2011.01.20
|
||||
Binary: build
|
||||
Maintainer: Adrian Schroeter <adrian@suse.de>
|
||||
Architecture: all
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package build (Version 2010.12.09)
|
||||
# spec file for package build (Version 2010.12.15)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -23,8 +23,8 @@ License: GPLv2+
|
||||
Group: Development/Tools/Building
|
||||
AutoReqProv: on
|
||||
Summary: A Script to Build SUSE Linux RPMs
|
||||
Version: 2010.12.09
|
||||
Release: 1
|
||||
Version: 2011.01.20
|
||||
Release: 0
|
||||
#!BuildIgnore: build-mkbaselibs
|
||||
Source: build-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
build (2010.12.15-1) unstable; urgency=low
|
||||
|
||||
* Update to current git trunk
|
||||
- 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]
|
||||
|
||||
-- Michael Schroeder <mls@suse.de> Wed, 15 Dec 2010 14:08:29 +0200
|
||||
|
||||
build (2010.07.28-1) unstable; urgency=low
|
||||
|
||||
* Update to current git trunk
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845
|
||||
size 1524
|
||||
Loading…
Reference in New Issue
Block a user