Accepting request 546366 from openSUSE:Tools

version update

OBS-URL: https://build.opensuse.org/request/show/546366
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build?expand=0&rev=111

PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20171117
+pkgver=20171128
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')

_service

@@ -9,7 +9,9 @@
     <param name="extract">dist/build-mkbaselibs-sle.spec</param>
     <param name="extract">dist/build.dsc</param>
     <param name="extract">dist/debian.changelog</param>
+    <param name="extract">dist/debian.compat</param>
     <param name="extract">dist/debian.control</param>
+    <param name="extract">dist/debian.rules</param>
     <param name="extract">dist/PKGBUILD</param>
   </service>
   <service name="recompress" mode="disabled">

build-mkbaselibs-sle.spec

@@ -20,14 +20,18 @@ Name:           build-mkbaselibs-sle
 Summary:        Tools to generate base lib packages
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-Version:        20171117
+Version:        20171128
 Release:        0
 #!BuildIgnore:  build-mkbaselibs
+#!BuildIgnore:  build-mkbaselibs-sle
 Provides:       build-mkbaselibs
 Conflicts:      otherproviders(build-mkbaselibs)
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+%if 0%{?is_opensuse}
+ExclusiveArch:  do-not-build
+%endif
 
 %description
 This package contains the parts which may be installed in the inner build system

build.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Nov 28 13:33:11 UTC 2017 - adrian@suse.de
+
+- Fixed Dockerfile repository parsing
+- Improve file name check extractbuild
+- track release number of containers
+- Define SOURCEURL and PATCHURL macros
+- Keep preinstalled packages
+- add libidn2 and libunistring to preinstall for archlinux
+
+-------------------------------------------------------------------
+Tue Nov 21 09:12:41 UTC 2017 - coolo@suse.com
+
+- buildignore the sle flavor of mkbaselibs for sle
+
 -------------------------------------------------------------------
 Fri Nov 17 09:36:04 UTC 2017 - adrian@suse.de
 

build.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20171117
+Version: 20171128
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all

build.spec

@@ -22,15 +22,12 @@ Name:           build
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0+ and GPL-2.0
 Group:          Development/Tools/Building
-Version:        20171117
+Version:        20171128
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-%if 0%{?suse_version} > 1200
+#!BuildIgnore:  build-mkbaselibs build-mkbaselibs-sle
-# required for test suite
-BuildRequires:  build-mkbaselibs
-%endif
 # Keep the following dependencies in sync with obs-worker package
 Requires:       bash
 Requires:       binutils
@@ -206,6 +203,8 @@ echo "test suite is not prepared to run using qemu linux user"
 echo "Skipping test case"
 exit 0
 %endif
+# we need to patch the not packaged configs, due to the buildignore
+sed -i 's,build-mkbaselibs,,' ../configs/*.conf
 ./testbuild.sh /.build.binaries/
 
 %files

debian.changelog

@@ -1,4 +1,4 @@
-build (20171117) unstable; urgency=low
+build (20171128) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection

debian.compat

@@ -0,0 +1 @@
+5

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/obs-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

obs-build-20171117.tar.gz

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

obs-build-20171128.tar.gz

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