ci: Fixed package build for both Ubuntu and OpenSUSE

Change-Id: Ia06c4401de7da6da0d5d57f722e478040de74004

diff --git a/distfiles/gbs.spec b/distfiles/gbs.spec
index 84bce45..0108e90 100644 (file)
--- a/distfiles/gbs.spec
+++ b/distfiles/gbs.spec
@@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README.rst
-%{_mandir}/man1/*
+#%{_mandir}/man1/*
 %{python_sitelib}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*

diff --git a/packaging/Makefile b/packaging/Makefile
index e551197..9c3687c 100644 (file)
--- a/packaging/Makefile
+++ b/packaging/Makefile
@@ -2,7 +2,7 @@ PKG_NAME := gbs
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 PKG_VERSION := $(shell grep '^Version: ' $(SPECFILE)|awk '{print $$2}')
 
-TARBALL := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+TARBALL := $(PKG_NAME)_$(PKG_VERSION).tar.gz
 
 dsc:
        @sed  -i 's/ [a-f0-9]\+ [0-9]\+ $(TARBALL)/ $(shell md5sum $(TARBALL) | sed "s/  / $(shell stat -c '%s' $(TARBALL)) /")/' $(PKG_NAME).dsc

diff --git a/packaging/gbs.dsc b/packaging/gbs.dsc
index 0b46538..8f5eb9b 100644 (file)
--- a/packaging/gbs.dsc
+++ b/packaging/gbs.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
 Source: gbs
-Version: 0.7
+Version: 0.7.1
 Binary: gbs
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
 Architecture: all
 Standards-Version: 3.7.1
 Build-Depends: debhelper (>= 4.0.0), python-dev, dpatch, cdbs
 Files:
- 99d10f17b7021d4dac4bd55c2314c195 57387 gbs_0.7.tar.gz
+ 74d430cf0facf50e885b4363f2bcfc0d 63499 gbs_0.7.1.tar.gz