[node-patches] Change in ovirt-node[master]: spec: Fix package naming

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: spec: Fix package naming
......................................................................

spec: Fix package naming

Change-Id: I804983abd77a6d7d5c40c9c73073376e195ac6a2
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M ovirt-node.spec.in
1 file changed, 9 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/92/43392/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index fcbad74..b979cff 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -1,5 +1,4 @@
 %global product_family oVirt Node
-%global product_release %{version} (0)
 %global mgmt_scripts_dir %{_sysconfdir}/node.d
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %define is_fedora_systemd %(test 0%{?fedora} -ne 0 && test %{?fedora} -ge 16 && echo 1 || echo 0)
@@ -18,16 +17,17 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global checkout %{?snapshot}git%{shortcommit}
 
+%global source_basename @PACKAGE_TARNAME at -@PACKAGE_VERSION@
+
 Summary:        The %{product_family} daemons/scripts
 Name:           ovirt-node
 Version:        @PACKAGE_RPM_VERSION@
-Release:        @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?dist}
 %if 0%{?use_snapshot}
-Release:        %{rhevh_build}%{?checkout}%{?dist}%{?extra_release}
+Release:        @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?checkout}%{?dist}
 Source0:        https://gerrit.ovirt.org/gitweb?p=%{name}.git;a=snapshot;h=%{commit};sf=tgz#/%{name}-%{version}%{?checkout}.tar.gz
 %else
-Release:        0%{?dist}%{-extra_release}
-Source0:        %{name}-%{version}.tar.gz
+Release:        @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?dist}
+Source0:        %{source_basename}.tar.gz
 %endif
 License:        GPLv2+
 Group:          Applications/System
@@ -149,8 +149,6 @@
 %else
 Requires:       livecd-tools >= 1:16.0
 %endif
-%endif
-
 Requires:       libselinux-python
 
 %define tools_root %{_datadir}/ovirt-node-tools
@@ -542,10 +540,10 @@
 
 %prep
 %if 0%{?use_snapshot}
-%setup -q -n"%{name}-%{?shortcommit}"                                                                    
+%setup -q -n"%{name}-%{?shortcommit}"
 %else
-%setup -q -n"%{name}-%{version}"                                                                         
-%endif  
+%setup -q -n"%{source_basename}"
+%endif
 
 
 %build
@@ -665,7 +663,7 @@
 #release info for dracut to pick it up into initramfs
 # remove symlink to keep original redhat-release
 rm -f /etc/system-release
-echo "%{product_family} release %{product_release}" > /etc/system-release
+echo "%{product_family} release %{version}" > /etc/system-release
 
 
 %pre


-- 
To view, visit https://gerrit.ovirt.org/43392
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I804983abd77a6d7d5c40c9c73073376e195ac6a2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>