From 258ba5a8dd7f6c6e45e582a8cf3fe35b006d2f78 Mon Sep 17 00:00:00 2001 From: OBS User lnussel Date: Wed, 2 Aug 2017 15:00:21 +0000 Subject: [PATCH] - Fix path to files - Temporary hack to aid liblua5_3 -> liblua5_3-5 renam Rev openSUSE:Tools/322 Md5 850ff111853ece5cf9cb35a9ee0a0589 2017-08-02 15:00:21 lnussel None --- PKGBUILD | 2 +- build-mkbaselibs-sle.changes | 5 +++++ build-mkbaselibs-sle.spec | 6 +++--- build.changes | 5 +++++ build.dsc | 2 +- build.spec | 7 ++++++- debian.changelog | 2 +- obs-build-20170720.tar.gz | 3 --- obs-build-20170802.tar.gz | 3 +++ 9 files changed, 25 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20170720.tar.gz create mode 100644 obs-build-20170802.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3e5c6339..2377bfca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170720 +pkgver=20170802 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes index aba6d28e..6d0f8572 100644 --- a/build-mkbaselibs-sle.changes +++ b/build-mkbaselibs-sle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 2 14:58:59 UTC 2017 - lnussel@suse.de + +- Fix path to files + ------------------------------------------------------------------- Thu Jun 30 19:05:52 CEST 2011 - ro@suse.de diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 419e0db8..d63084d7 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,7 +20,7 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20170720 +Version: 20170802 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs @@ -43,9 +43,9 @@ This is the SLE variant including IA64 binary generation. 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_global-deb.conf \ +install -m 0644 baselibs_configs/baselibs_global-deb.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global-deb.conf -install -m 0644 baselibs_global-sle.conf \ +install -m 0644 baselibs_configs/baselibs_global-sle.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf %files diff --git a/build.changes b/build.changes index 7712ee6e..7e04c6c6 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 2 14:59:15 UTC 2017 - lnussel@suse.de + +- Temporary hack to aid liblua5_3 -> liblua5_3-5 renam + ------------------------------------------------------------------- Thu Jul 20 13:59:20 CEST 2017 - mls@suse.de diff --git a/build.dsc b/build.dsc index ec839fd9..ac7a4a61 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20170720-0 +Version: 20170802-0 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 6477be8f..3bc152d1 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20170720 +Version: 20170802 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,6 +122,11 @@ chroot or a secure virtualized %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 + V=%suse_version + sed -i -e 's/liblua5_3/liblua5_3-5/g' configs/sl${V:0:2}.${V:2:1}.conf +%endif %endif %install diff --git a/debian.changelog b/debian.changelog index a4b1409a..89ea5638 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20170720-0) unstable; urgency=low +build (20170802-0) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20170720.tar.gz b/obs-build-20170720.tar.gz deleted file mode 100644 index df4f5ef2..00000000 --- a/obs-build-20170720.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd2e81a5704541c48a5541f040da1c0bcd64fceaead702c9836071986236d01b -size 303973 diff --git a/obs-build-20170802.tar.gz b/obs-build-20170802.tar.gz new file mode 100644 index 00000000..f6671f2f --- /dev/null +++ b/obs-build-20170802.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd3884dbba43347a793771938d1c8cf0c86eb766402aa718ba65b5f356a50dca +size 283909