Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2017-08-14 12:35:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build" Mon Aug 14 12:35:41 2017 rev:105 rq:514523 version:20170804 Changes: -------- New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build-mkbaselibs-sle.changes 2017-08-14 12:35:46.099823685 +0200 @@ -0,0 +1,20 @@ +------------------------------------------------------------------- +Wed Aug 2 14:58:59 UTC 2017 - [email protected] + +- Fix path to files + +------------------------------------------------------------------- +Thu Jun 30 19:05:52 CEST 2011 - [email protected] + +- provide build-mkbaselibs so this can really be used + +------------------------------------------------------------------- +Tue Jun 7 09:31:51 UTC 2011 - [email protected] + +- fix build + +------------------------------------------------------------------- +Mon Jun 6 15:12:13 UTC 2011 - [email protected] + +- new package for SLE baselibsconf, including ia64 arch defaults + --- /work/SRC/openSUSE:Factory/build/build.changes 2017-04-03 11:03:43.811361859 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2017-08-14 12:35:47.999556922 +0200 @@ -1,0 +2,11 @@ +Wed Aug 2 14:59:15 UTC 2017 - [email protected] + +- Temporary hack to aid liblua5_3 -> liblua5_3-5 rename + +------------------------------------------------------------------- +Thu Jul 20 13:59:20 CEST 2017 - [email protected] + +- switch baselibs scheme for debuginfo packages from + foo-debuginfo-32bit to foo-32bit-debuginfo [fate#323217] + +------------------------------------------------------------------- Old: ---- debian.tar.gz obs-build-20170320.tar.gz New: ---- build-mkbaselibs-sle.changes build-mkbaselibs-sle.spec debian.control obs-build-20170804.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-mkbaselibs-sle.spec ++++++ # # spec file for package build-mkbaselibs-sle # # Copyright (c) 2017 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 # 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/ # Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building Version: 20170804 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description This package contains the parts which may be installed in the inner build system for generating base lib packages. This is the SLE variant including IA64 binary generation. %prep %setup -q -n obs-build-%{version} %build %install install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build install -m 0755 mkbaselibs \ $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs install -m 0644 baselibs_configs/baselibs_global-deb.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf install -m 0644 baselibs_configs/baselibs_global.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf %files %defattr(-,root,root) %dir /usr/lib/build /usr/lib/build/mkbaselibs /usr/lib/build/baselibs* %changelog ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.JXnrhJ/_old 2017-08-14 12:35:52.118978467 +0200 +++ /var/tmp/diff_new_pack.JXnrhJ/_new 2017-08-14 12:35:52.122977905 +0200 @@ -18,19 +18,15 @@ # 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: 20170804 Release: 0 Source: obs-build-%{version}.tar.gz 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 @@ -126,6 +122,13 @@ %if 0%{?suse_version} # initvm make CFLAGS="$RPM_BUILD_FLAGS" initvm-all +#XXX temporary hack until lua is actually in +%if 0%{?suse_version} == 1330 +if rpm -q liblua5_3-5; then + V=%suse_version + sed -i -e 's/liblua5_3/liblua5_3-5/g' configs/sl${V:0:2}.${V:2:1}.conf +fi +%endif %endif %install @@ -139,22 +142,48 @@ # 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 -%else + +# tweak default config on suse %if 0%{?suse_version} -%if 0%{?sles_version} - ln -s sles%{sles_version}.conf default.conf -%else - V=%suse_version - ln -s sl${V:0:2}.${V:2:1}.conf default.conf +cd $RPM_BUILD_ROOT/usr/lib/build/configs/ +SUSE_V=%{?suse_version} +SLE_V=%{?sle_version} +%if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version == 1315 +# this is SUSE Leap 42.X +ln -s sl42.${SLE_V:3:1}.conf default.conf +%endif +%if 0%{?sle_version} && 0%{?is_opensuse} && %suse_version > 1315 +# this is SUSE Leap 15 and higher +ln -s sl${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf +%endif +%if !0%{?sle_version} && ( 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 || 0%{?suse_version} == 1330 ) +# this is old openSUSE releases and Factory +ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf +%endif +%if 0%{?sle_version} && !0%{?is_opensuse} +# this is SUSE SLE 12 and higher +ln -s sle${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf +%endif +%if 0%{?sles_version} == 1110 +# this is SUSE SLE 11 +ln -s sles11sp2.conf default.conf %endif +# make sure that we have a config test -e default.conf || exit 1 %endif + +# tweak baselibs config on suse +%if 0%{?suse_version} +cd $RPM_BUILD_ROOT/usr/lib/build +%if %suse_version == 1500 +# SLE 15 / Leap 15 +ln -sf baselibs_configs/baselibs_global-sle15.conf baselibs_global.conf +%endif +%if %suse_version <= 1315 +# SLE 12 / Leap 42 and older +ln -sf baselibs_configs/baselibs_global-sle12.conf baselibs_global.conf +%endif +test -e baselibs_global.conf || exit 1 %endif %check @@ -162,14 +191,9 @@ 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!" +if [ ! -f "$RPM_BUILD_ROOT/usr/lib/build/configs/default.conf" ]; then + echo "WARNING: No default config, 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/ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.JXnrhJ/_old 2017-08-14 12:35:52.206966111 +0200 +++ /var/tmp/diff_new_pack.JXnrhJ/_new 2017-08-14 12:35:52.206966111 +0200 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170320 +pkgver=20170804 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.JXnrhJ/_old 2017-08-14 12:35:52.238961619 +0200 +++ /var/tmp/diff_new_pack.JXnrhJ/_new 2017-08-14 12:35:52.238961619 +0200 @@ -3,6 +3,14 @@ <param name="versionformat">%ad</param> <param name="url">git://github.com/openSUSE/obs-build.git</param> <param name="scm">git</param> + <param name="extract">dist/build.changes</param> + <param name="extract">dist/build.spec</param> + <param name="extract">dist/build-mkbaselibs-sle.changes</param> + <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.control</param> + <param name="extract">dist/PKGBUILD</param> </service> <service name="recompress" mode="disabled"> <param name="compression">gz</param> ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.JXnrhJ/_old 2017-08-14 12:35:52.290954318 +0200 +++ /var/tmp/diff_new_pack.JXnrhJ/_new 2017-08-14 12:35:52.290954318 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170320 +Version: 20170804-0 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.JXnrhJ/_old 2017-08-14 12:35:52.346946455 +0200 +++ /var/tmp/diff_new_pack.JXnrhJ/_new 2017-08-14 12:35:52.346946455 +0200 @@ -1,4 +1,4 @@ -build (20170320) unstable; urgency=low +build (20170804-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ debian.control ++++++ Source: build Section: devel Priority: optional Maintainer: Adrian Schroeter <[email protected]> Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 Package: obs-build Architecture: all Depends: ${perl:Depends}, rpm Recommends: rpm2cpio Conflicts: build Replaces: build Provides: build Description: A script to build SUSE Linux RPMs This package provides a script for building RPMs for SUSE Linux in a chroot environment. ++++++ obs-build-20170320.tar.gz -> obs-build-20170804.tar.gz ++++++ ++++ 7350 lines of diff (skipped)
