diff --git a/barrier.spec b/barrier.spec index ffdab907..6c502422 100644 --- a/barrier.spec +++ b/barrier.spec @@ -1,12 +1,12 @@ Name: barrier -Version: 2.0.0 -#Version: 2.0.0-RC2 ###FIXME can't have a dash - in the version string +Version: 1.9.0 +#Version: 1.9.0-snapshot ###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: 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 -Source1: build_env.sh +#Source1: build_env.sh Vendor: Debauchee ### FIXME ### Packager: Tru Huynh 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. %prep -%setup -n %{name}-2.0.0-RC2 +%setup -n %{name}-1.9.0-snapshot %build -cp %{SOURCE1} . +cp dist/rpm/build_env.sh . %if 0%{?rhel} == 6 scl enable devtoolset-3 ./clean_build.sh diff --git a/dist/rpm/barrier.spec.in b/dist/rpm/barrier.spec.in index 79a288ae..8cf82ad3 100644 --- a/dist/rpm/barrier.spec.in +++ b/dist/rpm/barrier.spec.in @@ -6,7 +6,7 @@ Group: Applications/Productivity URL: https://github.com/debauchee/barrier/ 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 -Source1: build_env.sh +#Source1: build_env.sh Vendor: Debauchee ### FIXME ### Packager: Tru Huynh License: GPLv2 @@ -34,7 +34,7 @@ Work seamlessly across Windows, macOS and Linux. %setup -n %{name}-@BARRIER_VERSION@ %build -cp %{SOURCE1} . +cp dist/rpm/build_env.sh . %if 0%{?rhel} == 6 scl enable devtoolset-3 ./clean_build.sh diff --git a/dist/rpm/build_env.sh b/dist/rpm/build_env.sh new file mode 100644 index 00000000..d64876b5 --- /dev/null +++ b/dist/rpm/build_env.sh @@ -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}"