rpms/gridsite/EL-6 gridsite.spec,1.1,1.2

[stevetraylen]

Author: stevetraylen

Update of /cvs/pkgs/rpms/gridsite/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19018/EL-6

Modified Files:
	gridsite.spec 
Log Message:
Use apr0 on el4.



Index: gridsite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridsite/EL-6/gridsite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gridsite.spec	20 May 2010 19:59:52 -0000	1.1
+++ gridsite.spec	20 May 2010 22:13:30 -0000	1.2
@@ -1,7 +1,13 @@
+%if 0%{?el4}
+%define aprversion 0
+%else
+%define aprversion 1
+%endif
+
 Name:           gridsite
 Version:        1.5.18
 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Grid Security for the Web, Web platforms for Grids
 
 Group:          System Environment/Daemons
@@ -125,7 +131,7 @@ cp -p %{SOURCE5} .
 %patch1 -p1
 
 %build
-(cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-1 -fPIC " make )
+(cd src && MYCFLAGS="%{optflags} -DLINUX=2 -D_REENTRANT -D_LARGEFILE64_SOURCE -I../interface -I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion} -fPIC " make )
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -235,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/doxygen
 
 %changelog
+* Thu May 20 2010 Steve Traylen <steve.traylen at cern.ch> - 1.5.18-4
+- For .el4 use /usr/include/apr-0 rather than apr-1
+
 * Wed May 19 2010 Steve Traylen <steve.traylen at cern.ch> - 1.5.18-3
 - Don't use _sharedstatedir macro for .el4,5 support.