rpms/dap-netcdf_handler/devel dap-netcdf_handler.spec,1.12,1.13

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	dap-netcdf_handler.spec 
Log Message:
* Mon Jun 18 2007 Patrice Dumas <pertusus at free.fr> 3.7.6-4
- rebuild against bes



Index: dap-netcdf_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dap-netcdf_handler.spec	1 Jun 2007 21:18:29 -0000	1.12
+++ dap-netcdf_handler.spec	18 Jun 2007 21:31:35 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:         NetCDF 3 data handler for the OPeNDAP Data server
 Name:            dap-netcdf_handler
 Version:         3.7.6
-Release:         3%{?dist}
+Release:         4%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz
@@ -9,6 +9,8 @@
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   libdap-devel >= 3.7.5 netcdf-devel
+BuildRequires:   bes-devel
+
 
 %description
 This is the netcdf data handler for our data server. It reads netcdf 3
@@ -20,13 +22,25 @@
 
 %build
 %configure --disable-static --disable-dependency-tracking
+# configure-nc-data.sh is used during install to modify on the fly
+# the bes config file, this is very wrong. To avoid that it is emptied. 
+# The original is kept with a less generic name
+make configure-nc-data.sh
+cp -p configure-nc-data.sh besconfigure-nc-data.sh
+echo > configure-nc-data.sh
+
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm $RPM_BUILD_ROOT/%{_libdir}/*.so
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
+
+rm $RPM_BUILD_ROOT%{_bindir}/configure-nc-data.sh 
+install -m0755 -p besconfigure-nc-data.sh $RPM_BUILD_ROOT%{_bindir}/
+
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.so
+rm $RPM_BUILD_ROOT%{_libdir}/bes/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,11 +52,17 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/dap_nc_handler
+%{_bindir}/besconfigure-nc-data.sh
 %{_libdir}/libnc_handler.so.*
+%{_libdir}/bes/libnc_module.so
+%{_datadir}/hyrax/
 %doc COPYING COPYRIGHT NEWS
 %doc README
 
 %changelog
+* Mon Jun 18 2007 Patrice Dumas <pertusus at free.fr> 3.7.6-4
+- rebuild against bes
+
 * Fri Jun  1 2007 Patrice Dumas <pertusus at free.fr> 3.7.6-3
 - rebuild against newer libdap and netcdf