rpms/grads/FC-6 grads.spec,1.17,1.18

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26801

Modified Files:
	grads.spec 
Log Message:
don't ship wgrib, but don't depend on it before it is in the repo.



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-6/grads.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grads.spec	4 Oct 2006 22:36:59 -0000	1.17
+++ grads.spec	4 Dec 2006 21:01:14 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        17%{?dist}
+Release:        18%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -39,6 +39,9 @@
 BuildRequires:  libXmu-devel libX11-devel
 BuildRequires:  automake
 
+# in a separate package now
+#Requires:       wgrib
+
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
 that is used for easy access, manipulation, and visualization of earth science
@@ -46,6 +49,7 @@
 (Scientific Data Sets). GrADS has been implemented worldwide on a variety of
 commonly used operating systems and is freely distributed over the Internet.
 
+
 %prep
 %setup -q
 %patch -p1
@@ -53,8 +57,8 @@
 %patch -P 2 -p1
 # change path to datas to %{_datadir}/%{name}
 sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gx.h
-# copy grib notice
-cp %{SOURCE2} .
+# no need to copy grib notice anymore, since it is in a separate package
+#cp %{SOURCE2} .
 cp %{SOURCE6} .
 # copy hdf include wrapper file
 cp %{SOURCE7} src
@@ -77,6 +81,7 @@
 make %{?_smp_mflags}
 cp -r doc html
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -90,6 +95,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc COPYRIGHT html README.xorg grads-copyright_summary
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
@@ -101,14 +107,20 @@
 %{_bindir}/gxps
 %{_bindir}/gxtran
 %{_bindir}/stnmap
-%{_bindir}/wgrib
+# wgrib is in a separate package
+%exclude %{_bindir}/wgrib
 %{_datadir}/grads/
 
-%doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas <pertusus at free.fr> 1.9b4-18.1
+- don't ship wgrib
+
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 1.9b4-18
+- rebuild for new libcurl soname (indirect dependency through libnc-dap)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1.9b4-17
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 1.9b4-16
 - rebuild against libdap 3.7.2