Fix mclu spec builds.

You can now build an RPM by doing:

  make
  make dist
  rpmbuild -ta mclu-VERSION.tar.gz

diff --git a/.gitignore b/.gitignore
index b87c9e2..19c78cf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ Makefile.in
 /config.status
 /local*
 /install-sh
+/mclu-*.tar.gz
 /mclu
 /mclu.spec
 /missing

diff --git a/Makefile.am b/Makefile.am
index af13282..4447916 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+# Why doesn't automake include _SCRIPTS and _DATA ...?
+EXTRA_DIST = mclu.spec $(pkgdata_SCRIPTS) $(conf_DATA)
+
 # This rule just ensures that the wrapper binary and Python files get
 # installed when we do 'make install'.
 

diff --git a/mclu.spec.in b/mclu.spec.in
index 366194d..3ee0ab7 100644 (file)
--- a/mclu.spec.in
+++ b/mclu.spec.in
@@ -3,6 +3,8 @@ Version:         @PACKAGE_VERSION@
 Release:         1%{?dist}
 Summary:         Mini cluster, a virtualization cluster manager
 
+BuildArch:       noarch
+
 License:         GPLv2+
 URL:             http://git.annexia.org/?p=mclu.git;a=summary
 Source0:         @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
@@ -46,7 +48,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %dir %{_sysconfdir}/mclu/xmls/
 %config(noreplace) %{_sysconfdir}/mclu/mclu.conf
 %{_bindir}/mclu
-%{_pkgdatadir}/
+%{_datadir}/%{name}/
 
 
 %changelog