[ricci] Build fixes

[Chris Feist]

commit dc169e139bae38cee92e8460889be44d10968a39
Author: Chris Feist <cfeist at redhat.com>
Date:   Thu Aug 19 12:41:48 2010 -0500

    Build fixes

 .gitignore        |    9 +--------
 fedbuildfix.patch |   13 +++++++++++++
 ricci.spec        |    9 ++++++++-
 3 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4af3a24..405241c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-clustermon.spec.in
-clustermon.spec
-ricci.spec
-clustermon-*.rpm
-clustermon-*.tar.gz
-ricci-*.rpm
-ricci-*.tar.gz
-/ricci-0.18.tar.bz2
+ricci-*.tar.bz2
diff --git a/fedbuildfix.patch b/fedbuildfix.patch
new file mode 100644
index 0000000..48bb89b
--- /dev/null
+++ b/fedbuildfix.patch
@@ -0,0 +1,13 @@
+--- ricci-0.18/ricci/configure.fedfix	2010-08-19 12:34:36.414481820 -0500
++++ ricci-0.18/ricci/configure	2010-08-19 12:35:16.486544181 -0500
+@@ -21,7 +21,9 @@ for arg in $@
+ do
+ 	var=`echo $arg | sed -e s,^--\\\\\(.*\\\\\)=\\\\\(.*\\\\\),\\\1\ ?=\ \\\2,`
+ 	var=`echo $var | sed -e s,?=\ /,?=\ \\${DESTDIR}/,`
+-	echo $var >> $MAKE_DEFINES
++	if [ "$arg" != "$var" ] ; then
++	  echo $var >> $MAKE_DEFINES
++	fi
+ done
+ 
+ LIBDIR_SED=\\/lib
diff --git a/ricci.spec b/ricci.spec
index 21b8f97..0086b1c 100644
--- a/ricci.spec
+++ b/ricci.spec
@@ -10,16 +10,18 @@
 
 Name: ricci
 Version: 0.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
 Summary: Remote Cluster and Storage Management System
 Source0: http://people.redhat.com/rmccabe/conga/fedora/src/ricci-0.18.tar.bz2
+Patch0: fedbuildfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel python-devel libcap-devel
 BuildRequires: openssl-devel dbus-devel pkgconfig file-devel nss-devel
+BuildRequires: nspr-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 
 Requires: oddjob dbus openssl cyrus-sasl >= 2.1 file nss-tools
@@ -32,14 +34,19 @@ Requires(postun): initscripts
 
 %prep
 %setup -q
+%patch0 -p1 -b .fedbuildfix
 
 %build
+cd ricci
 %configure --arch=%{_arch} --docdir=%{_docdir}
 make %{?_smp_mflags} ricci
+cd ..
 
 %install
 rm -rf %{buildroot}
+cd ricci
 make DESTDIR=%{buildroot} install_ricci
+cd ..
 
 %clean
 rm -rf %{buildroot}