rpms/netcdf/FC-3 netcdf.spec,1.5,1.6

[Ed Hill (edhill)]

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9856/FC-3

Modified Files:
	netcdf.spec 
Log Message:
fix bug #156748 and several small clean-ups



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-3/netcdf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netcdf.spec	6 Mar 2005 04:37:01 -0000	1.5
+++ netcdf.spec	5 May 2005 20:20:57 -0000	1.6
@@ -1,6 +1,9 @@
+%define dist .fc3
+%define fedora 3
+
 Name:           netcdf
 Version:        3.6.0
-Release:        1.p1
+Release:        2.p1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
@@ -14,7 +17,7 @@
 %package devel
 Summary:        Development files for netcdf-3
 Group:          Development/Libraries
-#Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description
 NetCDF-3 (network Common Data Form ver3) is an interface for
@@ -65,22 +68,27 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+unset FC
+unset CPPFLAGS
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/netcdf-3
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}
+rm -rf ${RPM_BUILD_ROOT}
+mkdir ${RPM_BUILD_ROOT}
+mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}
 cd src
 %makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
   LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
-  MANDIR=$RPM_BUILD_ROOT/%{_mandir}
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f*
+  MANDIR=${RPM_BUILD_ROOT}%{_mandir}
+rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f*
+find ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 -type f | xargs chmod 644
+find ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 -type f | xargs chmod 644
+find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
 
 
 %files
@@ -97,6 +105,11 @@
 
 
 %changelog
+* Wed May  5 2005 Ed Hill <ed at eh3.com> - 3.6.0-2.p1
+- make netcdf-devel require netcdf (bug #156748)
+- cleanup environment and paths
+- fix file permissions
+
 * Sat Mar  5 2005 Ed Hill <ed at eh3.com> - 0:3.6.0-1.p1
 - update for 3.6.0-p1 large-files-bug fix and remove the Epoch