averi pushed to check-mk (f21). "Drop the nodistrelease tag as it will diverge from the revision number of the DEB and RPM files upstream ships. (..more)"

[notifications at fedoraproject.org]

>From b8eb23f485da04d1528eee2b05585d14f2e670e0 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Mon, 13 Apr 2015 15:34:26 +0200
Subject: Drop the nodistrelease tag as it will diverge from the revision
 number of the DEB and RPM files upstream ships. The revision of the DEB and
 RPM packages included by upstream is surely going to stick to -1 as only the
 version of check-mk itself is subjected to change. (i.e the version bump from
 1.2.6 to 1.2.6p1)


diff --git a/check-mk.spec b/check-mk.spec
index 4d527a0..cfd30a1 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -40,11 +40,6 @@ AutoReq:    0
 %filter_setup
 %endif
 
-# Get the revision number and remove the dist from it, we will use
-# this variable later on on the spec to remove the RPM and DEB files
-# included on the generated tarball.
-%global nodistrelease %(r=%{release}; echo ${r:0:1})
-
 %description
 check-mk is a general purpose Nagios-plugin for retrieving data. It adopts a
 new approach for collecting data from operating systems and network components.
@@ -248,9 +243,9 @@ rm -rf %{buildroot}%{_docdir}/check_mk/treasures/msexchange/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
 
 # Remove DEB and RPM files that upstream ships
-rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-%{nodistrelease}.noarch.rpm
+rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-1.noarch.rpm
 rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent.spec
-rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent_%{version}-%{nodistrelease}_all.deb
+rm %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent_%{version}-1_all.deb
 
 # Remove waitmax and its leftarounds from the wrong directory, the binary is being
 # built and installed into the check-mk-agent's package already.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=f21&id=b8eb23f485da04d1528eee2b05585d14f2e670e0