rpms/dap-server/devel dap-server.spec,1.23,1.24
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Tue Jan 1 22:55:18 UTC 2008
Author: pertusus
Update of /cvs/extras/rpms/dap-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24524
Modified Files:
dap-server.spec
Log Message:
* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 3.8.4-1
- update to 3.8.4
Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dap-server.spec 1 Jun 2007 21:49:51 -0000 1.23
+++ dap-server.spec 1 Jan 2008 22:54:40 -0000 1.24
@@ -7,29 +7,28 @@
Summary: Basic request handling for OPeNDAP servers
Name: dap-server
-Version: 3.7.4
-Release: 4%{?dist}
-License: LGPL
+Version: 3.8.4
+Release: 1%{?dist}
+License: LGPLv2+ and GPLv2+
Group: System Environment/Daemons
-Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz
+Source0: http://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
URL: http://www.opendap.org/
-Patch0: dap-server-3.7.4-get_url.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: curl libdap-devel >= 3.7.2
+BuildRequires: libdap-devel >= 3.7.10
+BuildRequires: bes-devel >= 3.5.3
# we use httpd and not webserver because we make use of the apache user.
-# not sure if it is right.
Requires: curl httpd
Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX)
Requires: perl(LWP::Simple)
%description
-This is base software for the OPeNDAP (Open-source Project for a Network
-Data Access Protocol) server. Written using the DAP++ C++ library and Perl,
-this handles processing compressed files and arranging for the correct
-server module to process the file. The base software also provides support
-for the ASCII response and HTML data-request form. Use this in combination
-with one or more of the format-specific handlers.
+This is base software for the CGI-based OPeNDAP (Open-source Project for
+a Network Data Access Protocol) server. Written using the DAP++ C++
+library and Perl, this handles processing compressed files and arranging
+for the correct server module to process the file. The base software also
+provides support for the ASCII response and HTML data-request form. Use
+this in combination with one or more of the format-specific handlers.
This package contains all the executable and perl modules. The scripts
and config files that should be installed in a cgi directory are in the
@@ -59,61 +58,68 @@
%prep
%setup -q
-%patch0 -p1 -b .get_url
%build
%configure --with-cgidir=%{dap_cgidir} --disable-dependency-tracking \
- --with-cgiconfdir=%{dap_cgiconfdir}
+ --with-cgiconfdir=%{dap_cgiconfdir} --disable-static
make %{?_smp_mflags}
+# keep the nph-dods timestamp
touch -r nph-dods __nph-dods_stamp
-# the security fix should cause the client to advertise something above 3.7.x
-sed -i -e 's:DAP2/3.7.4:DAP2/3.8.0:' nph-dods
# prepend -sample to cgi and config file to install them as doc
-cp -p opendap_apache.conf opendap_apache.conf-sample
-cp -p dap-server.rc dap-server.rc-sample
-cp -p nph-dods nph-dods-sample
-chmod a-x nph-dods-sample
+rm -rf __dist_doc
+mkdir __dist_doc
+cp -p opendap_apache.conf __dist_doc/opendap_apache.conf-sample
+cp -p dap-server.rc __dist_doc/dap-server.rc-sample
+cp -p nph-dods __dist_doc/nph-dods-sample
+chmod a-x __dist_doc/nph-dods-sample
-# adjust jgofs paths
+# adjust jgofs paths (even though jgofs isn't used, it is more consistent)
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
sed -e 's:cache_dir /usr/tmp:cache_dir %{dap_cachedir}:' \
- dap-server.rc-sample > dap-server.rc
-touch -r dap-server.rc-sample dap-server.rc
+ __dist_doc/dap-server.rc-sample > dap-server.rc
+touch -r __dist_doc/dap-server.rc-sample dap-server.rc
touch -r __nph-dods_stamp nph-dods
rm __nph-dods_stamp
# cgi-bin dir for the dap-server is in %%{dap_cgidir}, substitute that in
# opendap_apache.conf
sed -e 's:<<prefix>>/share/dap-server-cgi:%{dap_cgidir}:' \
- opendap_apache.conf-sample > opendap_apache.conf
-touch -r opendap_apache.conf-sample opendap_apache.conf
+ __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"
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
install -d -m755 $RPM_BUILD_ROOT%{dap_cachedir}
install -d -m755 $RPM_BUILD_ROOT%{dap_webconfdir}
install -d -m755 $RPM_BUILD_ROOT%{dap_cgiconfdir}
-install -p -m644 opendap_apache.conf $RPM_BUILD_ROOT%{dap_webconfdir}/
+install -p -m644 opendap_apache.conf._distributed $RPM_BUILD_ROOT%{dap_webconfdir}/opendap_apache.conf
+
+rm $RPM_BUILD_ROOT%{_libdir}/bes/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING COPYRIGHT_URI EXAMPLE_OPENDAP_STATISTICS NEWS README.cgi-server
-# add those as documentation
-%doc opendap_apache.conf-sample nph-dods-sample dap-server.rc-sample
+%doc COPYING COPYRIGHT_URI EXAMPLE_OPENDAP_STATISTICS NEWS README.hyrax
+%doc README.cgi-server
+%doc __dist_doc/*
+%{_bindir}/bes-dap-data.sh
%{_bindir}/dap_usage
%{_bindir}/dap_asciival
%{_bindir}/dap_www_int
+%{_datadir}/bes/
%{_datadir}/dap-server/
+%{_libdir}/bes/libascii_module.so
+%{_libdir}/bes/libusage_module.so
+%{_libdir}/bes/libwww_module.so
# the webserver must have write access to the cache dir
%attr(-,apache,apache) %{dap_cachedir}
@@ -126,6 +132,13 @@
%changelog
+* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 3.8.4-1
+- update to 3.8.4
+
+* Wed Jul 4 2007 Patrice Dumas <pertusus at free.fr> 3.8.2-1
+- update to 3.8.2
+- remove upstreamed security patch
+
* Fri Jun 1 2007 Patrice Dumas <pertusus at free.fr> 3.7.4-4
- rebuild against newer libdap
More information about the fedora-extras-commits
mailing list