Add ability to override default Release suffix in RPM packages.

In some cases, like building OvS packages in Jenkins, it may be
useful to set a custom version suffix that will correspond with
job's build number, etc. Currently, version number is explicitly
set to 1. This change adds a define "release_number" that may be
overridden during package bulding process:

rpmbuild -ba --define="release_number X" ...

Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>

5 files changed, 13 insertions, 6 deletions

diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in
index 7d3d9b498..de69863d7 100644
--- a/rhel/kmod-openvswitch-rhel6.spec.in
+++ b/rhel/kmod-openvswitch-rhel6.spec.in
@@ -9,10 +9,11 @@
 # without warranty of any kind.
 
 %define oname openvswitch
+%{!?release_number:%define release_number 1}
 
 Name:           kmod-%{oname}
 Version:        @VERSION@
-Release:        1%{?dist}
+Release:        %{release_number}%{?dist}
 Summary:        Open vSwitch kernel module
 
 Group:          System/Kernel
diff --git a/rhel/openvswitch-dkms.spec.in b/rhel/openvswitch-dkms.spec.in
index a47c038fd..c8a978a17 100644
--- a/rhel/openvswitch-dkms.spec.in
+++ b/rhel/openvswitch-dkms.spec.in
@@ -8,10 +8,11 @@
 # without warranty of any kind.
 
 %define oname openvswitch
+%{!?release_number:%define release_number 1}
 
 Name:             %{oname}-dkms
 Version:          @VERSION@
-Release:          1%{?dist}
+Release:          %{release_number}%{?dist}
 Summary:          Open vSwitch kernel module
 
 Group:            System/Kernel
@@ -27,7 +28,6 @@ BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # conflicts with the openvswitch-debuginfo package for OVS userspace).
 %undefine _enable_debug_packages
 
-
 %description
 Open vSwitch Linux kernel module.
 
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index e457fa679..90f242b1f 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -44,6 +44,8 @@
 %define _rundir /run
 %endif
 
+%{!?release_number:%define release_number 1}
+
 Name: openvswitch
 Summary: Open vSwitch
 Group: System Environment/Daemons
@@ -54,7 +56,7 @@ Version: @VERSION@
 # lib/sflow*.[ch] files are SISSL
 # datapath/ is GPLv2 (although not built into any of the binary packages)
 License: ASL 2.0 and LGPLv2+ and SISSL
-Release: 1%{?dist}
+Release: %{release_number}%{?dist}
 Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc gcc-c++
diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in
index ff190064f..e5f78701f 100644
--- a/rhel/openvswitch-kmod-fedora.spec.in
+++ b/rhel/openvswitch-kmod-fedora.spec.in
@@ -25,6 +25,8 @@
 #define kernel %{kernel_source}
 %{?kversion:%define kernel %kversion}
 
+%{!?release_number:%define release_number 1}
+
 Name: openvswitch-kmod
 Summary: Open vSwitch Kernel Modules
 Group: System Environment/Daemons
@@ -34,7 +36,7 @@ Version: @VERSION@
 
 # The entire source code is ASL 2.0 except datapath/ which is GPLv2
 License: GPLv2
-Release: 1%{?dist}
+Release: %{release_number}%{?dist}
 Source: openvswitch-%{version}.tar.gz
 #Source1: openvswitch-init
 Buildroot: /tmp/openvswitch-xen-rpm
diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
index ee8b3c9ea..220e5c747 100644
--- a/rhel/openvswitch.spec.in
+++ b/rhel/openvswitch.spec.in
@@ -21,6 +21,8 @@
 # testing out of tree kernel modules the appropriate openvswitch-kmod
 # package should be installed first.
 
+%{!?release_number:%define release_number 1}
+
 Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 Group: System Environment/Daemons
@@ -29,7 +31,7 @@ Vendor: Nicira, Inc.
 Version: @VERSION@
 
 License: ASL 2.0
-Release: 1
+Release: %{release_number}%{?dist}
 Source: openvswitch-%{version}.tar.gz
 Buildroot: /tmp/openvswitch-rpm
 Requires: logrotate, hostname, python >= 2.7, python-six