Problems with 1.2.0 RPM build from git

[Jake Davis <[email protected]…>]

While attempting to build rpms from a git checkout of the v1.2.0 tag following these instructions: ​http://docs.bcfg2.org/installation/packages.html#building-from-an-git-checkout

After "cd redhat; make" I get this error:

 error: File
 /root/VCS/git/bcfg2.davisj/redhat/build/bcfg2-1.2.0.tar.gz: No such
 file or directory
    make: *** [buildrpmdist] Error 1

And this one:

    RPM build errors:
        Installed (but unpackaged) file(s) found:
       /usr/lib/python2.4/site-packages/Bcfg2/Bcfg2Py3k.py
       /usr/lib/python2.4/site-packages/Bcfg2/Bcfg2Py3k.pyc
       /usr/lib/python2.4/site-packages/Bcfg2/Bcfg2Py3k.pyo
       /usr/sbin/bcfg2-test
    make: *** [buildrpmdist] Error 1

The following patch seems to resolve both errors.

index 7533b98..f8f7795 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -22,7 +22,7 @@ VERSION := $(shell cat VERSION)
 RELEASE := $(shell cat RELEASE)
 BASE_VER := ${VERSION}-${RELEASE}
 CURRENT_PACKAGE := $(PACKAGE)-$(BASE_VER)
-TARBALL := $(CURRENT_PACKAGE).tar
+TARBALL := $(PACKAGE)-$(VERSION).tar
 
 DIRNAME := $(shell echo $${PWD})
 DIRBASE := $(shell basename $${PWD})
diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in
index be2375c..92593a5 100644
--- a/redhat/bcfg2.spec.in
+++ b/redhat/bcfg2.spec.in
@@ -205,6 +205,7 @@ fi
 %{python_sitelib}/Bcfg2*.egg-info
 %dir %{python_sitelib}/Bcfg2
 %{python_sitelib}/Bcfg2/__init__.*
+%{python_sitelib}/Bcfg2/Bcfg2Py3k.*
 %{python_sitelib}/Bcfg2/Client
 %{python_sitelib}/Bcfg2/Component.*
 %{python_sitelib}/Bcfg2/Logger.*

Not that in later revisions of HEAD I also had to add "%{_sbindir}/bcfg2-test" to redhat/bcfg2.spec.in.

[Jake Davis <…>]

Also, the bcfg2-web rpm that is built when using the misc/bcfg2.spec file from a tarball is not created when following the instructions to build from a git checkout.

[https://www.google.com/accounts/o8/id?id=AItOawnSjgovXZr-_V3vGkvMSR0pc5LDykRc1Nc]

Fixed in ​https://github.com/Bcfg2/bcfg2/commit/e5d2140aaa82bc99d459ab357b29a1ce708451f7