rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixing missing build_env.sh for rpmbuild

This commit is contained in:
Tru Huynh (pasteur.fr) 2018-03-09 13:08:28 +01:00
parent 2a2feb290f
commit 557fc6e4f1
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
barrier.spec
View File

@ -1,12 +1,12 @@
Name: barrier Name: barrier
Version: 2.0.0 Version: 1.9.0
#Version: 2.0.0-RC2 ###FIXME can't have a dash - in the version string #Version: 1.9.0-snapshot ###FIXME can't have a dash - in the version string
Summary: Keyboard and mouse sharing solution Summary: Keyboard and mouse sharing solution
Group: Applications/Productivity Group: Applications/Productivity
URL: https://github.com/debauchee/barrier/ URL: https://github.com/debauchee/barrier/
Source: https://github.com/debauchee/barrier/archive/v2.0.0-RC2.tar.gz Source: https://github.com/debauchee/barrier/archive/v1.9.0-snapshot.tar.gz
# workaround the git versionning and set to Release instead of the default Debug # workaround the git versionning and set to Release instead of the default Debug
Source1: build_env.sh #Source1: build_env.sh
Vendor: Debauchee ### FIXME ### Vendor: Debauchee ### FIXME ###
Packager: Tru Huynh <tru@pasteur.fr> Packager: Tru Huynh <tru@pasteur.fr>
License: GPLv2 License: GPLv2
@ -31,10 +31,10 @@ Barrier allows you to share one mouse and keyboard between multiple computers.
Work seamlessly across Windows, macOS and Linux. Work seamlessly across Windows, macOS and Linux.
%prep %prep
%setup -n %{name}-2.0.0-RC2 %setup -n %{name}-1.9.0-snapshot
%build %build
cp %{SOURCE1} . cp dist/rpm/build_env.sh .
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
scl enable devtoolset-3 ./clean_build.sh scl enable devtoolset-3 ./clean_build.sh

4
dist/rpm/barrier.spec.in vendored
View File

@ -6,7 +6,7 @@ Group: Applications/Productivity
URL: https://github.com/debauchee/barrier/ URL: https://github.com/debauchee/barrier/
Source: https://github.com/debauchee/barrier/archive/v@BARRIER_VERSION@.tar.gz Source: https://github.com/debauchee/barrier/archive/v@BARRIER_VERSION@.tar.gz
# workaround the git versionning and set to Release instead of the default Debug # workaround the git versionning and set to Release instead of the default Debug
Source1: build_env.sh #Source1: build_env.sh
Vendor: Debauchee ### FIXME ### Vendor: Debauchee ### FIXME ###
Packager: Tru Huynh <tru@pasteur.fr> Packager: Tru Huynh <tru@pasteur.fr>
License: GPLv2 License: GPLv2
@ -34,7 +34,7 @@ Work seamlessly across Windows, macOS and Linux.
%setup -n %{name}-@BARRIER_VERSION@ %setup -n %{name}-@BARRIER_VERSION@
%build %build
cp %{SOURCE1} . cp dist/rpm/build_env.sh .
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
scl enable devtoolset-3 ./clean_build.sh scl enable devtoolset-3 ./clean_build.sh

7
dist/rpm/build_env.sh vendored Normal file
View File

@ -0,0 +1,7 @@
B_BUILD_TYPE=Release
BARRIER_VERSION_MAJOR=2
BARRIER_VERSION_MINOR=0
BARRIER_VERSION_PATCH=0
BARRIER_VERSION_STAGE=RC2
BARRIER_REVISION=99999999
B_CMAKE_FLAGS=" -D BARRIER_VERSION_MAJOR=${BARRIER_VERSION_MAJOR} -D BARRIER_VERSION_MINOR=${BARRIER_VERSION_MINOR} -D BARRIER_VERSION_PATCH=${BARRIER_VERSION_PATCH} -D BARRIER_VERSION_STAGE=${BARRIER_VERSION_STAGE} -D BARRIER_REVISION=${BARRIER_REVISION}"