rpms/dap-server/devel dap-server-4.0.0-perl.patch, NONE, 1.1 dap-server.spec, 1.32, 1.33

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/dap-server/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5879

Modified Files:
	dap-server.spec 
Added Files:
	dap-server-4.0.0-perl.patch 
Log Message:
Add patch to drop perl version check


dap-server-4.0.0-perl.patch:
 configure |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

--- NEW FILE dap-server-4.0.0-perl.patch ---
--- dap-server-4.0.0/configure.perl	2010-06-03 04:42:36.000000000 -0600
+++ dap-server-4.0.0/configure	2010-07-14 10:46:16.721005512 -0600
@@ -15509,16 +15509,8 @@
 	*perl*)
 	    perl_ver=`$PERL -v 2>&1 | awk '/This is perl/ {print}'`
 	    perl_ver=`echo $perl_ver | sed 's/This is perl,[^0-9]*\([0-9._]*\).*/\1/'`
-            perl_ver_main=`echo $perl_ver | sed 's/\([0-9]*\).*/\1/'`
-	    if test -n "$perl_ver" && test $perl_ver_main -ge 5
-	    then
-		{ $as_echo "$as_me:$LINENO: result: Found perl version ${perl_ver}." >&5
+	    { $as_echo "$as_me:$LINENO: result: Found perl version ${perl_ver}." >&5
 $as_echo "Found perl version ${perl_ver}." >&6; }
-	    else
-		{ { $as_echo "$as_me:$LINENO: error: perl version: found ${perl_ver} should be at least 5.000." >&5
-$as_echo "$as_me: error: perl version: found ${perl_ver} should be at least 5.000." >&2;}
-   { (exit 1); exit 1; }; }
-	    fi
 	    ;;
 	*)
 	    { $as_echo "$as_me:$LINENO: WARNING: perl is required." >&5


Index: dap-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- dap-server.spec	14 Jul 2010 16:31:53 -0000	1.32
+++ dap-server.spec	14 Jul 2010 16:47:06 -0000	1.33
@@ -12,6 +12,8 @@ Release:         1%{?dist}
 License:         LGPLv2+ and GPLv2+
 Group:           System Environment/Daemons 
 Source0:         http://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
+# Drop configure check for perl version
+Patch0:          dap-server-4.0.0-perl.patch
 URL:             http://www.opendap.org/
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +61,8 @@ web server DocumentRoot.
 
 %prep 
 %setup -q
+%patch0 -p1 -b .perl
+
 
 %build
 %configure --with-cgidir=%{dap_cgidir} --disable-dependency-tracking \
@@ -94,6 +98,7 @@ sed -e 's:<<prefix>>/share/dap-server-cg
     __dist_doc/opendap_apache.conf-sample > opendap_apache.conf._distributed
 touch -r __dist_doc/opendap_apache.conf-sample opendap_apache.conf._distributed
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
@@ -104,12 +109,15 @@ install -p -m644 opendap_apache.conf._di
 
 rm $RPM_BUILD_ROOT%{_libdir}/bes/*.la
 
+
 %check
 make check
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYRIGHT_URI EXAMPLE_OPENDAP_STATISTICS NEWS README
@@ -136,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Jul 13 2010 Orion Poplawski <orion at cora.nwra.com> - 4.0.0-1
 - Update to 4.0.0
+- Add patch to skip perl version check
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild