Accepting request 283413: version update
Rev openSUSE:Factory/88 Md5 bd75c2c5eb54da198bbbae7f0da9010a 2015-02-08 10:41:36 dimstar_suse 283413
This commit is contained in:
commit
728a8e8946
4
PKGBUILD
4
PKGBUILD
@ -1,5 +1,5 @@
|
||||
pkgname=build
|
||||
pkgver=20141120
|
||||
pkgver=20150115
|
||||
pkgrel=0
|
||||
pkgdesc="Build packages in sandbox"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -8,7 +8,7 @@ license=('GPL-2.0+' 'GPL-2.0')
|
||||
groups=('base-devel')
|
||||
depends=('perl')
|
||||
source=(obs-build-${pkgver}.tar.gz)
|
||||
md5sums=('07405ad5bd573e5534508105a09a9677')
|
||||
md5sums=('913a174848d39df902df09dedc0e1aa2')
|
||||
|
||||
package() {
|
||||
msg "Installing build ..."
|
||||
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 30 07:23:36 UTC 2015 - adrian@suse.de
|
||||
|
||||
- add recommend to perl(Net::SSL) (bnc#880212)
|
||||
- add support for debian debootstrap build engine
|
||||
- Update arch config
|
||||
- Add support for conflicts, addselfprovides, weakdeps to query functions
|
||||
- installed package handling works also for arch and debian now
|
||||
- large code cleanup
|
||||
- bugfixes and documentation updates
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 24 15:45:59 UTC 2014 - adrian@suse.de
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
Format: 1.0
|
||||
Source: build
|
||||
Version: 20141120
|
||||
Version: 20150115
|
||||
Binary: build
|
||||
Maintainer: Adrian Schroeter <adrian@suse.de>
|
||||
Architecture: all
|
||||
|
40
build.spec
40
build.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package build
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -14,21 +14,27 @@
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
# needsrootforbuild
|
||||
# needsbinariesforbuild
|
||||
|
||||
|
||||
Name: build
|
||||
Summary: A Script to Build SUSE Linux RPMs
|
||||
License: GPL-2.0+ and GPL-2.0
|
||||
Group: Development/Tools/Building
|
||||
Version: 20141120
|
||||
Version: 20150115
|
||||
Release: 0
|
||||
#!BuildIgnore: build-mkbaselibs
|
||||
Source: obs-build-%{version}.tar.gz
|
||||
#!BuildIgnore: build-mkbaselibs
|
||||
Source1: baselibs.conf
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
# Manual requires to avoid hard require to bash-static
|
||||
AutoReqProv: off
|
||||
%if 0%{?suse_version} > 1200
|
||||
# required for test suite
|
||||
BuildRequires: build-mkbaselibs
|
||||
%endif
|
||||
# Keep the following dependencies in sync with obs-worker package
|
||||
Requires: bash
|
||||
Requires: binutils
|
||||
@ -49,6 +55,7 @@ Recommends: perl(Pod::Usage)
|
||||
Recommends: perl(Time::Zone)
|
||||
Recommends: perl(URI)
|
||||
Recommends: perl(XML::Parser)
|
||||
Recommends: perl(Net::SSL)
|
||||
Recommends: bsdtar
|
||||
Recommends: qemu-linux-user
|
||||
%endif
|
||||
@ -138,9 +145,34 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/
|
||||
V=%suse_version
|
||||
ln -s sl${V:0:2}.${V:2:1}.conf default.conf
|
||||
%endif
|
||||
test -e default.conf
|
||||
test -e default.conf || exit 1
|
||||
%endif
|
||||
|
||||
%check
|
||||
if [ `whoami` != "root" ]; then
|
||||
echo "WARNING: Not building as root, tests did not run!"
|
||||
exit 0
|
||||
fi
|
||||
# get back the default.conf link
|
||||
cp -av $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf configs/
|
||||
# do not get confused when building this already with build:
|
||||
export BUILD_IGNORE_2ND_STAGE=1
|
||||
# use our own build code
|
||||
export BUILD_DIR=$PWD
|
||||
cd test
|
||||
# target is autodetected
|
||||
%if 0%{?sles_version}
|
||||
echo "SLES config differs currently on purpose between OBS and build script."
|
||||
echo "Skipping test case"
|
||||
exit 0
|
||||
%endif
|
||||
%if 0%{?qemu_user_space_build}
|
||||
echo "test suite is not prepared to run using qemu linux user"
|
||||
echo "Skipping test case"
|
||||
exit 0
|
||||
%endif
|
||||
./testbuild.sh /.build.binaries/
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
|
@ -1,4 +1,4 @@
|
||||
build (20141120) unstable; urgency=low
|
||||
build (20150115) unstable; urgency=low
|
||||
|
||||
* Update to current git trunk
|
||||
- add sles11sp2 build config and adapt autodetection
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6dedf48a86f921a2e2205ad970c57581915eb3ea624f82fdb92a5c05f43be100
|
||||
size 203948
|
3
obs-build-20150115.tar.gz
Normal file
3
obs-build-20150115.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:927020b7d1346b80c8dae454732045b9086a74918a647359cb43443f7f92a665
|
||||
size 208920
|
Loading…
Reference in New Issue
Block a user