Fix handling of extra_release for Fedora

diff --git a/ChangeLog b/ChangeLog
index 3287ffc06c580413d80a369a60a61b798d2c9e77..b05cc905a206a5ca37e53185cf237e3306a697b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 14 21:30:28 EST 2007 Daniel Berrange <berrange@redhat.com>
+
+       * libvirt.spec.in: Change way extra_release is inserted to
+       work with Fedora 7 where %dist is always defined
+
 Thu Jun 14 21:15:28 EST 2007 Daniel Berrange <berrange@redhat.com>
 
        * src/Makefile.am: Fix generation of coverage files by

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 4d5c9bee56411e727d135c827dc37ac4b3bacdc2..726b2d5633084226b2957efa2fd13c427bab0948 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1,15 +1,9 @@
 # -*- rpm-spec -*-
 
-# This macro is used for the continuous automated builds. It just
-# allows an extra fragment based on the timestamp to be appended
-# to the release. This distinguishes automated builds, from formal
-# Fedora RPM builds
-%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
-
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: @VERSION@
-Release: 1%{?_extra_release}
+Release: 1%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz