1.3.0pre1 doesn't build from misc/bcfg2.spec

[m4z <[email protected]…>]

I wondered if the Version (1.3.0) and Release (0.0pre1) tags for 1.3.0pre1 were broken, since Release is usually just the RPM build count (the "version of the RPM package"), but stpierre on IRC explained that they were chosen to keep the package upgradeable (from 1.3.0-x.xpre1 to 1.3.0-x.x with greater x in the latter, whereas 1.3.0pre1-* to 1.3.0-* would not work with most or all rpm tools).

However, this choice leads to problems with the RPM macros because the tarball is still named 1.3.0pre1, as is the directory within it. The following isn't beautiful, but fixes the build:

> osc diff -r1
Index: bcfg2.spec
===================================================================
--- bcfg2.spec	(revision 1)
+++ bcfg2.spec	(working copy)
@@ -18,10 +18,10 @@
 %endif
 License:          BSD
 URL:              http://bcfg2.org
-Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz
+Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}pre1.tar.gz
 %if 0%{?suse_version}
 # SUSEs OBS does not understand the id macro below.
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}
+BuildRoot:        %{_tmppath}/%{name}-%{version}pre1-%{release}
 %else
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:        %{_tmppath}/%{name}-%{version}pre1-%{release}-root-%(%{__id_u} -n)
 %endif
@@ -229,7 +229,7 @@
 This package includes the Bcfg2 reports web frontend.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}pre1
 
 %build
 %{__python}%{pythonversion} setup.py build

I assume this will probably not be merged because it is just temporary and will need to be changed back when 1.3.0 is released, but now at least this ticket documents it. (;

[solj]

I have updated export.py to take these bits into account.