[ricci] Fixes for fedora build in common directory.

Chris Feist cfeist at fedoraproject.org
Wed Feb 9 21:06:45 UTC 2011


commit 6cdb6a052e06d18f426d43ef92aa64bf48b8fa9a
Author: Chris Feist <cfeist at redhat.com>
Date:   Wed Feb 9 15:06:38 2011 -0600

    Fixes for fedora build in common directory.

 fedfix.patch |   11 +++++++++++
 ricci.spec   |    4 +++-
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/fedfix.patch b/fedfix.patch
new file mode 100644
index 0000000..1182bf5
--- /dev/null
+++ b/fedfix.patch
@@ -0,0 +1,11 @@
+--- ricci-0.18.6/ricci/common/Makefile.fedfix	2011-02-09 15:04:43.676821527 -0600
++++ ricci-0.18.6/ricci/common/Makefile	2011-02-09 15:04:57.693163192 -0600
+@@ -39,7 +39,7 @@ INCLUDE +=
+ CXXFLAGS +=
+ CXXFLAGS_PARANOIA = -DPARANOIA=1
+ CFLAGS_PARANOIA = -DPARANOIA=1
+-CFLAGS +=
++CFLAGS += `nspr-config --cflags`
+ LDFLAGS +=
+ 
+ .PHONY: prep
diff --git a/ricci.spec b/ricci.spec
index 62f25d4..1ddc230 100644
--- a/ricci.spec
+++ b/ricci.spec
@@ -10,12 +10,13 @@
 
 Name: ricci
 Version: 0.18.6
-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-%{version}.tar.bz2
+Patch0: fedfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel python-devel libcap-devel
@@ -33,6 +34,7 @@ Requires(postun): initscripts
 
 %prep
 %setup -q
+%patch0 -p1 -b .fedfix
 
 %build
 cd ricci


More information about the scm-commits mailing list