From 6984a68c870f9234f75cc5248c399b42f8c5e4d0 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Sun, 22 Mar 2015 08:17:37 -0300 Subject: [PATCH] Define rpm version from setup.py --- ci/build_rpm.sh | 2 +- colab.spec | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/build_rpm.sh b/ci/build_rpm.sh index 4899534..11238c0 100755 --- a/ci/build_rpm.sh +++ b/ci/build_rpm.sh @@ -48,7 +48,7 @@ fi echo "Building package: $version-$release" -sudo HOME=/root chroot /tmp/centos-7/ rpmbuild --define "release $release" -ba /root/rpmbuild/SPECS/colab.spec --quiet +sudo HOME=/root chroot /tmp/centos-7/ rpmbuild --define "version $version" --define "release $release" -ba /root/rpmbuild/SPECS/colab.spec --quiet sudo cp /tmp/centos-7/root/rpmbuild/RPMS/noarch/colab-$version-$release.noarch.rpm . diff --git a/colab.spec b/colab.spec index b888bc8..c5e7912 100644 --- a/colab.spec +++ b/colab.spec @@ -1,6 +1,7 @@ %define name colab -%define version 1.9 -%define unmangled_version 1.9 +# version must be given from command line +# %define version ?? +%define unmangled_version %{version} %define default_release 1 %{!?release: %define release %{default_release}} %define buildvenv /var/tmp/%{name}-%{version} -- libgit2 0.21.2