rpms/dap-server/devel dap-server-fix_config.diff, NONE, 1.1 dap-server.spec, 1.12, 1.13

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/dap-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2503

Modified Files:
	dap-server.spec 
Added Files:
	dap-server-fix_config.diff 
Log Message:
* Sun Jun 18 2006 Patrice Dumas <dumas at centre-cired.fr> 3.6.1-1
- update to 3.6.1
- adjust for newer jgofs handler even though it isn't packaged


dap-server-fix_config.diff:

--- NEW FILE dap-server-fix_config.diff ---
Index: opendap_apache.conf
===================================================================
--- opendap_apache.conf	(révision 14064)
+++ opendap_apache.conf	(copie de travail)
@@ -28,5 +28,5 @@
 # directory and nph-dods CGI script from users. Use this to make your URLs
 # look nicer.
 
-ScriptAliasMatch ^/dap(.*) "<<prefix>>/share/dap-server-cgi/nph-dods$1
+ScriptAliasMatch ^/dap(.*) <<prefix>>/share/dap-server-cgi/nph-dods$1
 
Index: dap-server.rc.in
===================================================================
--- dap-server.rc.in	(révision 14064)
+++ dap-server.rc.in	(copie de travail)
@@ -62,6 +62,6 @@
 # For JGOFS datasets, match either the dataset name or the absence of an
 # extension. The later case is sort of risky, but if you have lots of JGOFS
 # datasets might be appealing.
-handler .*/test$ @prefix@/bin/jg_handler
-# handler .*/[^/]+$ @prefix@/bin/jg_handler
+handler .*/test$ @prefix@/bin/dap_jg_handler
+# handler .*/[^/]+$ @prefix@/bin/dap_jg_handler
 


Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dap-server.spec	3 Mar 2006 12:34:31 -0000	1.12
+++ dap-server.spec	18 Jun 2006 14:05:35 -0000	1.13
@@ -6,12 +6,13 @@
 
 Summary:         Basic request handling for OPeNDAP servers 
 Name:            dap-server
-Version:         3.6.0
-Release:         2%{?dist}
+Version:         3.6.1
+Release:         1%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz
 URL:             http://www.opendap.org/
+Patch0:          dap-server-fix_config.diff
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   curl libdap-devel >= 3.6.0
@@ -32,16 +33,23 @@
 is usable without manual configuration, install %{name}-cgi.
 
 %package cgi
-Summary:        A CGI interface for the DAP server
+Summary:        A preconfigured CGI interface for the OPeNDAP server
 Requires:       %{name} = %{version}-%{release}
 Requires:       dap-freeform_handler dap-netcdf_handler dap-hdf4_handler
+#Requires:       dap-jgofs_handler
 Group:          System Environment/Daemons
 
 %description cgi
-A CGI interface for the DAP server that works without manual configuration.
+A CGI interface for the OPeNDAP server that works without manual 
+configuration. The web server is setup such that the CGI directory is
+at %{dap_cgidir}. The datasets should be setup in that directory.
+The default configuration allows for the use of the following handlers:
+freeform, netcdf, hdf4.
+# and jgofs.
 
 %prep 
 %setup -q
+%patch0
 
 %build
 %configure --with-cgidir=%{dap_cgidir}
@@ -51,6 +59,9 @@
 cp opendap_apache.conf opendap_apache.conf-sample
 cp dap-server.rc dap-server.rc-sample
 cp nph-dods nph-dods-sample
+# adjust jgofs paths
+sed -i -e 's:^\$ENV{"JGOFS_METHOD"} = "`pwd`";:\$ENV{"JGOFS_METHOD"} = "%{_bindir}";:' nph-dods
+sed -i -e 's:^\$ENV{"JGOFS_OBJECT"} = "`pwd`";:\$ENV{"JGOFS_OBJEXT"} = "%{dap_cgidir}";:' nph-dods
 
 # /usr/tmp isn't a safe place, substitute to a dir in 
 # /var/cache
@@ -85,14 +96,18 @@
 %attr(-,apache,apache) %{dap_cachedir}
 
 %files cgi
-%defattr(-,apache,apache,-)
+%defattr(-,root,root,-)
 %config(noreplace) %{dap_webconfdir}/opendap_apache.conf
-%dir %{dap_cgidir}
-%config(noreplace) %{dap_cgidir}/dap-server.rc
-%{dap_cgidir}/nph-dods
+%attr(-,apache,apache) %dir %{dap_cgidir}
+%attr(-,apache,apache) %config(noreplace) %{dap_cgidir}/dap-server.rc
+%attr(-,apache,apache) %{dap_cgidir}/nph-dods
 
 
 %changelog
+* Sun Jun 18 2006 Patrice Dumas <dumas at centre-cired.fr> 3.6.1-1
+- update to 3.6.1
+- adjust for newer jgofs handler even though it isn't packaged
+
 * Fri Mar  3 2006 Patrice Dumas <dumas at centre-cired.fr> 3.6.0-2
 - new release