From 0c9c68f4f45cd5f921b4115aa91b8aac935d81aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 24 May 2017 12:23:10 +0000 Subject: [PATCH] use build descriptions from git OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=305 --- PKGBUILD | 2 +- _service | 10 ++++++ build.dsc | 2 +- build.spec | 21 +++---------- debian.changelog | 2 +- debian.compat | 1 + debian.control | 15 +++++++++ debian.copyright | 21 +++++++++++++ debian.docs | 1 + debian.rules | 65 +++++++++++++++++++++++++++++++++++++++ debian.tar.gz | 3 -- obs-build-20170320.tar.gz | 3 -- obs-build-20170524.tar.gz | 3 ++ 13 files changed, 123 insertions(+), 26 deletions(-) create mode 100644 debian.compat create mode 100644 debian.control create mode 100644 debian.copyright create mode 100644 debian.docs create mode 100644 debian.rules delete mode 100644 debian.tar.gz delete mode 100644 obs-build-20170320.tar.gz create mode 100644 obs-build-20170524.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 6eb7e4bc..64d4f8e5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170320 +pkgver=20170524 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index d10d5648..8abe886d 100644 --- a/_service +++ b/_service @@ -3,6 +3,16 @@ %ad git://github.com/openSUSE/obs-build.git git + dist/build.changes + dist/build.dsc + dist/build.spec + dist/debian.changelog + dist/debian.compat + dist/debian.control + dist/debian.copyright + dist/debian.docs + dist/debian.rules + dist/PKGBUILD gz diff --git a/build.dsc b/build.dsc index 7b8a0b8e..76102c02 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170320 +Version: 20170524-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 954d0575..351f32bf 100644 --- a/build.spec +++ b/build.spec @@ -18,13 +18,11 @@ # needsbinariesforbuild -%define version_unconverted 20170320 - Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170320 +Version: 20170524 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -140,11 +138,9 @@ chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.* # main make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ -%if 0%{?sle_version} && 0%{?is_opensuse} - # super special leap distro - major="$[%sle_version/10000+30]" - minor="$[%sle_version/100-1200]" - ln -s sl$major.$minor.conf default.conf +%if "0%{?suse_version}" == "1315" && 0%{?is_opensuse} +# super special leap distro + ln -s sl42.1.conf default.conf %else %if 0%{?suse_version} %if 0%{?sles_version} @@ -162,15 +158,6 @@ if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, tests did not run!" exit 0 fi -if [ ! -e $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf ]; then -%if 0%{?suse_version} - echo "ERROR: No default build conf, tests did not run!" - exit 1 -%else - echo "WARNING: No default build conf, tests did not run!" - exit 0 -%endif -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: diff --git a/debian.changelog b/debian.changelog index 8504d47b..1122a854 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170320) unstable; urgency=low +build (20170524-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/debian.compat b/debian.compat new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/debian.compat @@ -0,0 +1 @@ +4 diff --git a/debian.control b/debian.control new file mode 100644 index 00000000..5f4e2433 --- /dev/null +++ b/debian.control @@ -0,0 +1,15 @@ +Source: build +Section: devel +Priority: optional +Maintainer: Adrian Schroeter +Build-Depends: debhelper (>= 4) +Standards-Version: 3.7.2 + +Package: build +Architecture: all +Depends: ${perl:Depends}, rpm +Recommends: rpm2cpio +Description: A script to build SUSE Linux RPMs + This package provides a script for building RPMs for SUSE Linux + in a chroot environment. + diff --git a/debian.copyright b/debian.copyright new file mode 100644 index 00000000..77327544 --- /dev/null +++ b/debian.copyright @@ -0,0 +1,21 @@ +This package was debianized by Rene Engelhard on +Thu, 22 Jun 2006 12:01:08 +0200. + +It was downloaded from http://software.opensuse.org/download/openSUSE:/Tools/SUSE_Linux_Factory/src + +Upstream authors: Thorsten Kukuk + Michael Schröter + Bernhard Kaindl + Mad Martin Jorgensen + Andreas Schwab + Rüdiger Oertel + Andreas Gruenbacher + +Copyright: (c) 1997-2007 SuSE GmbH Nuernberg, Germany + +License: + +GPL + +The Debian packaging is (C) 2006, Rene Engelhard and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/debian.docs b/debian.docs new file mode 100644 index 00000000..e845566c --- /dev/null +++ b/debian.docs @@ -0,0 +1 @@ +README diff --git a/debian.rules b/debian.rules new file mode 100644 index 00000000..84180075 --- /dev/null +++ b/debian.rules @@ -0,0 +1,65 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany +# This file and all modifications and additions to the pristine package +# are under the same license as the package itself. +# +# Please submit bugfixes or commens via http://bugs.opensuse.org + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +SHELL=/bin/bash + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + make DESTDIR=$(CURDIR)/debian/build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: build install + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian.tar.gz b/debian.tar.gz deleted file mode 100644 index 199e34ce..00000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9046961c3e5f2f0f18a2d8bcd83e83dbb84953ee5fbbf45c01ba3c217a9c6eb3 -size 1561 diff --git a/obs-build-20170320.tar.gz b/obs-build-20170320.tar.gz deleted file mode 100644 index eaadc8a2..00000000 --- a/obs-build-20170320.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5840e93399c30643bf5f24749b08dd5068951b92c053f3389cb6f64f71bef719 -size 259476 diff --git a/obs-build-20170524.tar.gz b/obs-build-20170524.tar.gz new file mode 100644 index 00000000..e9084c8b --- /dev/null +++ b/obs-build-20170524.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f79dcb812c6b91936cd95dbc748bc9f71b26dd15e2b8a5c3c966db56a45584af +size 285225