[grads/f15] Update to 2.0.1 Remove grads-README.xorg - the info is no more relevant for current (popular) Linux

Fri Jan 27 05:19:57 UTC 2012

commit 36d88ba17fa8ea095435ad241154a10e8463322e
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Fri Jan 27 00:20:01 2012 -0500

    Update to 2.0.1
    Remove grads-README.xorg - the info is no more relevant for current (popular) Linux Desktops (KDE4 and GNOME 3).
    Remove grads-copyright_summary - Already sorted out upstream.

 grads-README.xorg                   |    8 --
 grads-copyright_summary             |  170 -----------------------------------
 grads-find-system-libs.patch        |   22 -----
 grads-use-system-libshp_libsx.patch |   60 ++++++++++++
 grads.spec                          |   26 +++---
 sources                             |    2 +-
 6 files changed, 72 insertions(+), 216 deletions(-)
---

diff --git a/grads-use-system-libshp_libsx.patch b/grads-use-system-libshp_libsx.patch
new file mode 100644
index 0000000..95e9728
--- /dev/null
+++ b/grads-use-system-libshp_libsx.patch
@@ -0,0 +1,60 @@
+--- configure.ac	2011-10-24 15:45:27.000000000 -0400
++++ configure.ac.new	2012-01-26 17:37:30.468843678 -0500
+@@ -280,7 +280,11 @@
+   echo "Checking for libraries to support GUI interface ..."
+   GA_CHECK_GUI([
+     use_gui=yes
+-    GA_SET_LIB_VAR(gui_libs, [sx])
++    if test "$ga_dyn_supplibs" != "yes" ; then
++      GA_SET_LIB_VAR(gui_libs, [sx])
++    else
++      gui_libs="-lsx"
++    fi
+     if test z"$gui_libs_Xext" != 'z'; then
+       gui_libs="$gui_libs -lXext"
+     fi
+@@ -304,7 +308,9 @@
+   else
+     AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
+   fi
+-  GA_SET_INCLUDE_VAR([gui_inc],[libsx]) 
++  if test "$ga_dyn_supplibs" != "yes" ; then
++    GA_SET_INCLUDE_VAR([gui_inc],[libsx])
++  fi 
+   AC_SUBST(gui_inc)
+   AC_SUBST(gui_libs)
+   AC_DEFINE(USEGUI, 1, [Enable GUI widgets]) 
+@@ -429,7 +435,18 @@
+     ])    
+     GA_UNSET_FLAGS
+   fi
+-  # here's where we could add a macro to look outside supplibs for shapelib
++  # look outside supplibs for shapelib
++  if test "$use_shp" != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
++    echo
++    echo "Checking in system locations for libraries to support shapefiles ..."
++    AC_CHECK_HEADERS([shapefil.h], 
++    [ AC_CHECK_LIB([shp], [main],
++      [ use_shp=yes 
++        shp_inc=""
++        shp_libs="-lshp"
++      ])
++    ])
++  fi
+ fi
+ if test "$use_shp" != "yes" ; then
+   AC_DEFINE(USESHP, 0, [Enable shapefile])
+--- src/Makefile.am	2010-11-23 13:14:27.000000000 -0500
++++ src/Makefile.am.new	2012-01-26 20:53:05.815131660 -0500
+@@ -29,7 +29,11 @@
+ supp_lib_dir		= $(SUPPLIBS)/lib
+ 
+ # Settings used for all binaries
++if USEGUI
++LDADD			=
++else
+ LDADD			= -L$(supp_lib_dir) 
++endif
+ INCLUDES		= $(readline_inc) $(printim_inc) $(grib2_inc) $(gui_inc) $(nc_inc) \
+ 			  $(hdf_inc) $(hdf5_inc) $(geotiff_inc) $(shp_inc) $(gadap_inc) \
+                           $(X_CFLAGS) $(XAW_CFLAGS) $(GD_CFLAGS) $(HDF4_CFLAGS)
diff --git a/grads.spec b/grads.spec
index e2daa0e..6bf81c1 100644
--- a/grads.spec
+++ b/grads.spec
@@ -1,6 +1,6 @@
 Name:           grads
-Version:        2.0.a9
-Release:        0.2%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -10,12 +10,7 @@ URL:            http://grads.iges.org/grads/grads.html
 
 Source0:        ftp://iges.org/grads/2.0/grads-%{version}-src.tar.gz
 
-# Copyrights explanation
-Source1:        grads-copyright_summary
-# README telling to turn BackingStore true
-Source2:        grads-README.xorg
-
-Patch0:		grads-find-system-libs.patch
+Patch0:		grads-use-system-libshp_libsx.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +19,7 @@ BuildRequires:  g2clib-static g2clib-devel udunits-devel
 BuildRequires:  readline-devel ncurses-devel
 BuildRequires:  shapelib-devel gd-devel libgeotiff-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel libpng-devel
-BuildRequires:  libXmu-devel libX11-devel libsx-devel
+BuildRequires:  libXmu-devel libX11-devel libsx-devel libXaw-devel
 BuildRequires:  pkgconfig
 BuildRequires:  automake
 
@@ -44,15 +39,11 @@ commonly used operating systems and is freely distributed over the Internet.
 %patch0 -p0 -b .sys
 # change path to datas to %{_datadir}/%{name}
 sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gxsubs.c
-cp -p %{SOURCE1} .
-# README for use with xorg
-cp -p %{SOURCE2} README.xorg
 autoreconf -f -i
 
 %build
 #./bootstrap
-%configure --enable-dyn-supplibs				\
-	--without-gui --with-geotiff --with-sdf	--with-shp	\
+%configure --enable-dyn-supplibs --with-geotiff --with-sdf --with-shp	\
 	--with-netcdf-include=%{_includedir} --with-netcdf-libdir=%{_libdir}\
 	LDFLAGS="-L%{_libdir}/hdf/"	\
 	CPPFLAGS="-I%{_includedir}/hdf -I%{_includedir}/libshp"
@@ -77,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT __dist_docs/html README.xorg grads-copyright_summary
+%doc COPYRIGHT __dist_docs/html
 %{_bindir}/bufrscan
 %{_bindir}/grads
 %{_bindir}/gribmap
@@ -93,6 +84,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 26 2012 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
+- Update to 2.0.1
+- Remove grads-README.xorg - the info is no more relevant for current (popular) Linux Desktops (KDE4 and GNOME 3).
+- Remove grads-copyright_summary - Already sorted out upstream. 
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.a9-0.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 2ed80b9..5d153f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2009b3937d1754b173714b133339eb74  grads-2.0.a9-src.tar.gz
+de63762d0af62d50a838f9013652bd7a  grads-2.0.1-src.tar.gz
