diff --git a/.gitignore b/.gitignore index 8acbc67..c5133b0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /obs-build-20171023.tar.gz /obs-build-20180816.tar.gz /obs-build-20190321.tar.gz +/obs-build-20191114.tar.gz diff --git a/0501-Revert-Drop-shebang-line-from-openstack-console.patch b/0501-Revert-Drop-shebang-line-from-openstack-console.patch new file mode 100644 index 0000000..71e838d --- /dev/null +++ b/0501-Revert-Drop-shebang-line-from-openstack-console.patch @@ -0,0 +1,40 @@ +From 1a72d8927d8b2e3ab6789407d5dee4345777373f Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Mon, 18 Nov 2019 00:39:15 -0500 +Subject: [PATCH] Revert "Drop shebang line from openstack-console" + +This is a bad fix to this problem. It's just better to +force it to Python 3 in this case. + +This reverts commit e4809dbb4fdedac89c1e0b1f86bd02478e12007f. +--- + build-vm-openstack | 2 +- + openstack-console | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build-vm-openstack b/build-vm-openstack +index 2bc4527..54bbd1c 100644 +--- a/build-vm-openstack ++++ b/build-vm-openstack +@@ -270,7 +270,7 @@ vm_startup_openstack() { + sleep 1 + done + +- if ! python $BUILD_DIR/openstack-console "${WS_URL}" ; then ++ if ! $BUILD_DIR/openstack-console "${WS_URL}" ; then + $NOVACLIENT delete $OPENSTACK_BUILD_ID + cleanup_and_exit 3 + else +diff --git a/openstack-console b/openstack-console +index 0a11141..3565f9e 100644 +--- a/openstack-console ++++ b/openstack-console +@@ -1,3 +1,5 @@ ++#!/usr/bin/python ++ + ################################################################ + # + # Copyright (c) 2017 SUSE Linux Products GmbH +-- +2.21.0 + diff --git a/obs-build.spec b/obs-build.spec index 73f184f..6911da5 100644 --- a/obs-build.spec +++ b/obs-build.spec @@ -3,16 +3,16 @@ # SUSE guys use OBS to automatically handle release numbers, # when rebasing check what they are using on -# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_28/src/ +# http://download.opensuse.org/repositories/openSUSE:/Tools/Fedora_31/src/ # update the obsrel to match the upstream release number -%global obsrel 314.1 +%global obsrel 323.1 # Actual release %global rel 1 Name: obs-build -Version: 20190321 -Release: %{obsrel}.%{rel}%{?dist}.1 +Version: 20191114 +Release: %{obsrel}.%{rel}%{?dist} Summary: A generic package build script License: (GPLv2 or GPLv3) and GPLv2+ @@ -21,11 +21,17 @@ URL: https://github.com/openSUSE/obs-build # Tarball retrieved from # https://build.opensuse.org/package/show/openSUSE:Tools/build Source0: %{name}-%{version}.tar.gz + +# Potentially not upstreamable patches +## Restore shebang to openstack-console script +Patch0501: 0501-Revert-Drop-shebang-line-from-openstack-console.patch + BuildArch: noarch BuildRequires: perl-generators BuildRequires: python3-devel Requires: bash, perl-interpreter, binutils, tar +Requires: gzip, bzip2, xz, zstd Requires: python3-websocket-client Provides: build = %{version}-%{release} @@ -106,6 +112,9 @@ sed -e "s|#!/usr/bin/python|#!%{__python3}|" \ %changelog +* Mon Nov 18 2019 Neal Gompa - 20191114-323.1.1 +- Update to new release + * Thu Jul 25 2019 Fedora Release Engineering - 20190321-314.1.1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 69a0f71..890a013 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (obs-build-20190321.tar.gz) = 2043156845a21275e6535c0bc1c2a4a599e6b95026fbe8b2408a55e15d126ed8df69d0d8733eed93b61c503067fadb936bf460ebc4416a47dd5dde1f4a7d43d6 +SHA512 (obs-build-20191114.tar.gz) = d1ce7b53e251fdbe917f59204be842ec665a66ccf4a38cfcf95eb3bc85d2bf6be3d6d012cdd26998538008923c1a3e7befb614b211867ae183f25962b20cf745