SUSE: rpm-packaging fixes

Change-Id: Ic7ddc34bbb2fe414d41a083efd8caf35a12488ab
Signed-off-by: Marco Varlese <marco.varlese@suse.de>

diff --git a/extras/rpm/Makefile b/extras/rpm/Makefile
index 4bbeab5..423c420 100644 (file)
--- a/extras/rpm/Makefile
+++ b/extras/rpm/Makefile
@@ -26,7 +26,14 @@ PC=%
 
 all: RPM
 
-ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+# SUSE rolling-release (a.k.a. Tumbleweed)
+ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
+SPEC_FILE='vpp-suse.spec'
+# SUSE osleap15
+else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
+SPEC_FILE='vpp-suse.spec'
+# SUSE leap42.x
+else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
 SPEC_FILE='vpp-suse.spec'
 else
 SPEC_FILE='vpp.spec'

diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index 3da2383..e1b9bd7 100644 (file)
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -157,7 +157,7 @@ This package contains the python bindings for the vpp api
 export VPP_BUILD_USER=suse
 export VPP_BUILD_HOST=SUSE
 
-make V=1 PLATFORM=vpp build-release
+make V=1 PLATFORM=vpp vpp_uses_cmake=no build-release
 
 cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_build}