Changeset 197

Timestamp:

08/03/15 17:01:32 (9 years ago)

Author:

kdeugau

Message:

/trunk

Commit update to .spec file removing the stack of %if blocks in favour
of a single %define using the newish %dist

File:

• trunk/debbuild.spec (modified) (2 diffs)

trunk/debbuild.spec

@@ -6 +6 @@
 # More links may be available from http://www.rpm.org
 
-# A collection of magic to set the release "number" such that dist upgrades will, erm, upgrade.
-# NB:  This really only applies to packages built with debbuild.
-%if %{?debdist:0}%{?!debdist:1}
-%define debdist etch
-%endif
-%if "%{debdist}" == "sarge"
-%define errata 0
-%endif
-%if "%{debdist}" == "dapper"
-%define errata 1
-%endif
-%if "%{debdist}" == "etch"
-%define errata 2
-%endif
-%if "%{debdist}" == "lenny"
-%define errata 3
-%endif
-if "%{debdist}" == "squeeze"
-%define errata 4
-%endif
-if "%{debdist}" == "wheezy"
-%define errata 5
-%endif
-if "%{debdist}" == "jessie"
-%define errata 6
-%endif
-%if %{?relnum:0}%{?!relnum:1}
-%define relnum 1
-%endif
-
-# %{_vendor} is only set to "redhat" on Red Hat (Enterprise) Linux and direct
-# derivatives/ancestors (eg Fedora Core).  Upstream rpm (as packaged in Debian,
-# for instance) sets it to "rpm".  debbuild sets it to "debbuild".
-%if %{_vendor} == "redhat"
-%define errata el4
-%define release %{relnum}.%{errata}
-%else
-%define release %{relnum}.%{errata}%{debdist}
-%endif
+%define release %{relnum}.%{dist}
 
 Summary: Build Debian-compatible .deb packages from RPM .spec files
@@ -94 +56 @@
 
 %changelog
+* Sun Jul 19 2015  Kris Deugau <kdeugau@deepnet.cx>
+- Remove the stack of %if's determining the Debian dist;  use the recently
+  refined %{dist} instead
+
 * Thu Feb 28 2008  Kris Deugau <kdeugau@deepnet.cx> -1
 - Initial package