[ricci] More build fixes.

[Chris Feist]

commit 3b991b3d2427cd1b3c7da88fefbe2a105e7cfccd
Author: Chris Feist <cfeist at redhat.com>
Date:   Thu Aug 19 12:57:14 2010 -0500

    More build fixes.

 fedbuildfix.patch |   18 ++++++++++++++++--
 ricci.spec        |    4 ++++
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/fedbuildfix.patch b/fedbuildfix.patch
index 48bb89b..08b5a90 100644
--- a/fedbuildfix.patch
+++ b/fedbuildfix.patch
@@ -1,5 +1,19 @@
---- 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
+--- ricci-0.18/ricci/ccs_sync/Makefile.fedbuildfix	2010-08-19 12:44:03.692481903 -0500
++++ ricci-0.18/ricci/ccs_sync/Makefile	2010-08-19 12:43:33.605544458 -0500
+@@ -23,9 +23,9 @@ OBJECTS = \
+ 	ricci_conf_xml.o
+ 
+ CC=gcc
+-INCLUDE = -I/usr/include/libxml2 -I/usr/include/nspr4 `nss-config --cflags`
++INCLUDE = -I/usr/include/libxml2 -I/usr/include/nspr4 `nss-config --cflags` `nspr-config --cflags`
+ CFLAGS = -O2 -Wall -Wextra -Wformat=2 -fstack-protector -Wshadow $(INCLUDE)
+-LDFLAGS = -lxml2 `nss-config --libs`
++LDFLAGS = -lxml2 `nss-config --libs` `nspr-config --libs`
+ 
+ all: ${TARGET}
+ 
+--- ricci-0.18/ricci/configure.fedbuildfix	2010-08-03 23:27:09.000000000 -0500
++++ ricci-0.18/ricci/configure	2010-08-19 12:42:19.785543538 -0500
 @@ -21,7 +21,9 @@ for arg in $@
  do
  	var=`echo $arg | sed -e s,^--\\\\\(.*\\\\\)=\\\\\(.*\\\\\),\\\1\ ?=\ \\\2,`
diff --git a/ricci.spec b/ricci.spec
index 0086b1c..d2fcc13 100644
--- a/ricci.spec
+++ b/ricci.spec
@@ -38,6 +38,8 @@ Requires(postun): initscripts
 
 %build
 cd ricci
+sed -i -e 's/^VERSION.*/VERSION=%{version}/' make/version.in ../make/version.in
+sed -i -e 's/^RELEASE.*/RELEASE=%{release}/' make/version.in ../make/version.in
 %configure --arch=%{_arch} --docdir=%{_docdir}
 make %{?_smp_mflags} ricci
 cd ..
@@ -72,6 +74,8 @@ reboot, rpm, storage, service, virtual machine, and log management modules.
 			%{_sbindir}/ricci
 %attr(-,root,ricci)	%{_libexecdir}/ricci/
 			%{_docdir}/ricci-%{version}/
+			%{_mandir}/man8/ccs_sync*
+
 # modrpm
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf