From 6c279c957bdcbcef96fecad8b060016ce05c7c86 Mon Sep 17 00:00:00 2001 From: "Tru Huynh (pasteur.fr)" Date: Fri, 23 Mar 2018 20:15:36 +0100 Subject: [PATCH] RC2 in the spec file, not Source --- barrier.spec | 8 ++++---- docker/CentOS-7-release-builder/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/barrier.spec b/barrier.spec index 5a439ad9..82ef9172 100644 --- a/barrier.spec +++ b/barrier.spec @@ -1,10 +1,10 @@ Name: barrier Version: 2.0.0 -#Version: 2.0.0-RC2 ###FIXME can't have a dash - in the version string Summary: Keyboard and mouse sharing solution Group: Applications/Productivity URL: https://github.com/debauchee/barrier/ -Source: barrier-2.0.0-Source.tar.gz +Source: barrier-2.0.0-RC2.tar.gz +#Source: barrier-2.0.0-Source.tar.gz #Source: https://github.com/debauchee/barrier/archive/v2.0.0-RC2.tar.gz # workaround the git versionning and set to Release instead of the default Debug #Source1: build_env.sh @@ -38,8 +38,8 @@ Work seamlessly across Windows, macOS and Linux. %endif %prep -%setup -n %{name}-2.0.0-Source -#%setup -n %{name}-2.0.0-RC2 +#%setup -n %{name}-2.0.0-Source +%setup -n %{name}-2.0.0-RC2 %build echo "export B_BUILD_TYPE=Release" > build_env.sh diff --git a/docker/CentOS-7-release-builder/Dockerfile b/docker/CentOS-7-release-builder/Dockerfile index 32baf57c..c5477237 100644 --- a/docker/CentOS-7-release-builder/Dockerfile +++ b/docker/CentOS-7-release-builder/Dockerfile @@ -10,4 +10,4 @@ RUN yum -y install cmake3 make qt5-qtbase-devel gcc \ # during the testing period using truatpasteurdotfr/barrier pre-released tarball # final version should use the https://github.com/debauchee/barrier release versions -RUN wget https://github.com/truatpasteurdotfr/barrier/archive/v2.0.0-RC2.tar.gz -O barrier-2.0.0-Source.tar.gz && rpmbuild -ta barrier-2.0.0-Source.tar.gz | tee rpmbuild.log +RUN wget https://github.com/truatpasteurdotfr/barrier/archive/v2.0.0-RC2.tar.gz -O barrier-2.0.0-RC2.tar.gz && rpmbuild -ta barrier-2.0.0-RC2.tar.gz | tee rpmbuild.log