SPECS: switchboard.spec - fix build on th

glen glen at pld-linux.org
Tue Oct 7 14:51:16 CEST 2008


Author: glen                         Date: Tue Oct  7 12:51:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix build on th

---- Files affected:
SPECS:
   switchboard.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/switchboard.spec
diff -u SPECS/switchboard.spec:1.4 SPECS/switchboard.spec:1.5
--- SPECS/switchboard.spec:1.4	Tue Oct  7 14:43:34 2008
+++ SPECS/switchboard.spec	Tue Oct  7 14:51:11 2008
@@ -8,10 +8,13 @@
 Source0:	http://www.flyingparchment.org.uk/dump/%{name}-%{version}.tar.gz
 # Source0-md5:	6f32beb6b6942c67a187f8f19155731e
 URL:		https://confluence.toolserver.org/display/switchboard/Home
-BuildRequires:	boost-call_traits-devel
 BuildRequires:	boost-devel
+BuildRequires:	rpm >= 4.4.9-56
+%if "%{pld_release}" == "ac"
+BuildRequires:	boost-call_traits-devel
 BuildRequires:	boost-mem_fn-devel
 BuildRequires:	boost-ref-devel
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_fcgi_path	/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
@@ -62,7 +65,7 @@
 	MANDIR=%{_mandir} \
 	BINDIR=%{_sbindir} \
 	ROOTUSER=%(id -un) \
-	ROOTGROUP=%(id -un) \
+	ROOTGROUP=%(id -gn) \
 	SB_GROUP=%(id -gn) \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -94,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008/10/07 12:51:11  glen
+- fix build on th
+
 Revision 1.4  2008/10/07 12:43:34  glen
 - update to 2.0.17, overquote,boost,make patches applied
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/switchboard.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list