rpms/dap-server/FC-6 dap-server.spec,1.20,1.21

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/dap-server/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21310

Modified Files:
	dap-server.spec 
Log Message:
sync with devel


Index: dap-server.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-server/FC-6/dap-server.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dap-server.spec	30 Apr 2007 23:02:22 -0000	1.20
+++ dap-server.spec	1 May 2007 13:11:29 -0000	1.21
@@ -8,7 +8,7 @@
 Summary:         Basic request handling for OPeNDAP servers 
 Name:            dap-server
 Version:         3.7.4
-Release:         1%{?dist}
+Release:         2%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz
@@ -62,48 +62,45 @@
 %patch0 -p1 -b .get_url
 
 %build
-%configure --with-cgidir=%{dap_cgidir} --disable-dependency-tracking
-#--with-cgiconfdir=%{dap_cgiconfdir}
+%configure --with-cgidir=%{dap_cgidir} --disable-dependency-tracking \
+ --with-cgiconfdir=%{dap_cgiconfdir}
 make %{?_smp_mflags}
 
+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 opendap_apache.conf opendap_apache.conf-sample
-cp dap-server.rc dap-server.rc-sample
-cp nph-dods nph-dods-sample
+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
 
 # 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
-# put the cgi config file at a right place
-sed -i -e 's:\./dap-server.rc:%{dap_cgiconfdir}dap-server.rc:' nph-dods
-
-# 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
 
 # /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
+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
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-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 -m644 opendap_apache.conf $RPM_BUILD_ROOT/%{dap_webconfdir}/
-# install the config file below %_sysconfdir
-install -m644 dap-server.rc $RPM_BUILD_ROOT/%{dap_cgiconfdir}/
-# the config file is also installed in the cgi directory
-rm $RPM_BUILD_ROOT/%{dap_cgidir}/dap-server.rc
+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}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -129,7 +126,7 @@
 
 
 %changelog
-* Mon Apr 30 2007  Patrice Dumas <pertusus at free.fr> 3.7.4-1
+* Mon Apr 30 2007  Patrice Dumas <pertusus at free.fr> 3.7.4-2
 - update to 3.7.4
 - fix security issue
 - remove config files upstreamed patch