[grads/el6/master] - Update to 2.0.a9 - Remove upstreamed patches
Deji Akingunola
deji at fedoraproject.org
Fri Sep 3 16:49:26 UTC 2010
commit 510d4fc30816fca980f43844eba34907c4020133
Author: Deji Akingunola <dakingun at gmail.com>
Date: Fri Sep 3 12:51:17 2010 -0400
- Update to 2.0.a9
- Remove upstreamed patches
.gitignore | 1 +
NOTICE.wgrib | 29 ----
gawrapsd.h | 14 --
grads-README.xorg | 8 +-
grads-build_system.patch | 358 ------------------------------------------
grads-copyright_summary | 43 +----
grads-dap_build_fixes.patch | 278 --------------------------------
grads-find-system-libs.patch | 22 +++
grads-remove-files | 22 ---
grads-removed-files-list | 19 ---
grads.spec | 84 ++++-------
libdap.m4 | 314 ------------------------------------
libnc-dap.m4 | 264 -------------------------------
libnc-dap_header.m4 | 97 ------------
sources | 2 +-
15 files changed, 66 insertions(+), 1489 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 89faabb..c51e61d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
grads-src-free-1.9b4.tar.gz
+/grads-2.0.a9-src.tar.gz
diff --git a/grads-README.xorg b/grads-README.xorg
index 3520baf..71f4754 100644
--- a/grads-README.xorg
+++ b/grads-README.xorg
@@ -1,7 +1,7 @@
-You should enable the BackingStore capability of your X server if you want
-to avoid that windows on top of the grads window erase the grads window
-content. With xorg, you should put the following in the Device section of
-xorg.conf:
+If you are not using a composited desktop environment, you should enable the
+BackingStore capability of your X server if you want to avoid that windows on
+top of the grads window erase the grads window content. With xorg, you should
+put the following in the Device section of xorg.conf:
Option "BackingStore" "True"
diff --git a/grads-copyright_summary b/grads-copyright_summary
index 13d07d9..3bdd76c 100644
--- a/grads-copyright_summary
+++ b/grads-copyright_summary
@@ -97,6 +97,7 @@ gaexpr.c (A) IGES
gafunc.c (A) IGES
gagmap.c (A) IGES
gagmap.h (A) IGES
+gagui.c (A) Arlindo da Silva
gagx.c (A) IGES
gaio.c (A) IGES
gamach.c (A) IGES
@@ -105,13 +106,12 @@ gasdf.h (I) Julia Collins and Don Hooper
gasdf_std_time.h (I) Julia Collins
gauser.c (A) IGES
gautil.c (A) IGES
-gd13gif.c (B) Jef Poskanzer
- (C) Hutchison Avenue Software Corporation
-gd13gif.h (D) Cold Spring Harbor Labs
grads.c (A) IGES
grads.h (A) IGES
+grib2scan.c (A) IGES
gribmap.c (A) IGES
gscrpt.c (A) IGES
+gsgui.h (A) Arlindo da Silva
gs.h (A) IGES
gxchpl.c (A) IGES
gxcntr.c (A) IGES
@@ -130,6 +130,7 @@ gxsubs.c (A) IGES
gxtran.c (A) IGES
gxwmap.c (A) IGES
gxX.c (A) IGES
+stnmap.c (A) IGES
wgrib.c (H) public domain
wx.h (A) IGES
gs-mode.el (A) Joe Wielgosz
@@ -141,16 +142,14 @@ doc/* (A) IGES haven't checked all the files!
??: no copyright and no licence
-fgrib.h (??)
-fgrib_init.h (??)
-galats.c (??)
+galloc.c (??)
+gatypes.h (??) small file
gribscan.c (??)
+gstmp.c (??)
gvt.h (??)
gxdxwd.c (??)
gxmap.h (??) small file
-latsgribmap.c (??)
mtable.c (??) small file
-pcx11e.h (??) small file
=======================================================================
@@ -166,30 +165,6 @@ Z: cannot be sold for profit
* copy, or redistribute this software so long as it is not sold for
* profit, and provided this notice is retained.
-Y: cannot be redistributed
-
- * This software may not be distributed to others without
- * permission of the author.
-
-
-fgbds.c (?) Mike Fiorino
-fgutil.c (?) Wesley Ebisuzaki
-gacfg.c (A) IGES
- (Z) Arlindo da Silva
-gagui.c (Z) Arlindo da Silva
-gaimg.c (Z) Arlindo da Silva
-gaimg.h (Z) Arlindo da Silva small file
-gsgui.c (Z) Arlindo da Silva
-gstmp.c (?) Mike Fiorino and ?
-lats.c (Y) Regents of the University of California
-latsgrib.c (Y) Regents of the University of California
-lats.h (Y) Regents of the University of California
-latsint.c (Y) Regents of the University of California
-latsint.h (Y) Regents of the University of California
-latsnc.c (Y) Regents of the University of California
-latsparm.h (Y) Regents of the University of California
-latsstat.c (Y) Regents of the University of California
-latstime.c (Y) Regents of the University of California
-latstime.h (Y) Regents of the University of California
-pcx11e.c (?) Arlindo da Silva based on Xlibemu
+gacfg.c (Z) IGES
+gagui.h (Z) Arlindo da Silva
diff --git a/grads-find-system-libs.patch b/grads-find-system-libs.patch
new file mode 100644
index 0000000..f301b66
--- /dev/null
+++ b/grads-find-system-libs.patch
@@ -0,0 +1,22 @@
+--- configure.ac 2010-08-30 13:21:31.000000000 -0400
++++ configure.ac.new 2010-09-03 10:34:44.860929508 -0400
+@@ -429,7 +429,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])
diff --git a/grads.spec b/grads.spec
index b557cd7..c573148 100644
--- a/grads.spec
+++ b/grads.spec
@@ -1,6 +1,6 @@
Name: grads
-Version: 1.9b4
-Release: 28%{?dist}
+Version: 2.0
+Release: 0.a9.1%{?dist}
Summary: Tool for easy acces, manipulation, and visualization of data
Group: Applications/Engineering
@@ -8,41 +8,24 @@ Group: Applications/Engineering
License: GPLv2 and MIT
URL: http://grads.iges.org/grads/grads.html
-# original tarball contains non free code
-#Source0: ftp://grads.iges.org/grads/1.9/grads-src-%{version}.tar.gz
-Source0: grads-src-free-%{version}.tar.gz
-# Use these files to remove files with GPL incompatible licences. In the
-# SOURCES directory with grads tarball and grads-removed-files-list, do
-# sh grads-remove-files
-Source100: grads-remove-files
-Source101: grads-removed-files-list
-
-# opendap/DODS detection
-Source3: libdap.m4
-Source4: libnc-dap.m4
-Source8: libnc-dap_header.m4
-# the copyright notice for wgrib
-Source2: NOTICE.wgrib
+Source0: ftp://iges.org/grads/2.0/grads-%{version}.a9-src.tar.gz
+
# Copyrights explanation
-Source6: grads-copyright_summary
+Source1: grads-copyright_summary
# README telling to turn BackingStore true
-Source5: grads-README.xorg
-# include file that changes netcdf names to netcdf hdf names
-Source7: gawrapsd.h
+Source2: grads-README.xorg
-Patch0: grads-build_system.patch
-Patch1: grads-dap_build_fixes.patch
+Patch0: grads-find-system-libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: hdf-devel
-BuildRequires: udunits-devel netcdf-devel
-BuildRequires: readline-devel
-BuildRequires: libnc-dap-devel
-BuildRequires: zlib-devel libjpeg-devel gd-devel
-BuildRequires: ncurses-devel libpng-devel
+BuildRequires: hdf-static hdf-devel hdf5-devel netcdf-devel
+BuildRequires: g2clib-static g2clib-devel udunits-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: shapelib-devel gd-devel libgeotiff-devel
+BuildRequires: zlib-devel libjpeg-devel libpng-devel
BuildRequires: libXmu-devel libX11-devel
BuildRequires: pkgconfig
-BuildRequires: automake
+BuildRequires: automake autoconf
# in a separate package now
Requires: wgrib
@@ -56,32 +39,22 @@ commonly used operating systems and is freely distributed over the Internet.
%prep
-%setup -q
-%patch0 -p1 -b .build_system
-%patch1 -p1 -b .dap_build_fixes
+%setup -q -n %{name}-%{version}.a9
+%patch0 -p0 -b .sys
# change path to datas to %{_datadir}/%{name}
-sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gx.h
-# no need to copy grib notice anymore, since it is in a separate package
-#cp -p %{SOURCE2} .
-cp -p %{SOURCE6} .
-# copy hdf include wrapper file
-cp -p %{SOURCE7} src
-# concatenate autoconf m4 files
-cp -p acinclude.m4 acinclude.m4.save
-cat %{SOURCE3} %{SOURCE4} %{SOURCE8} acinclude.m4 > acinclude.m4.new
-cp acinclude.m4.new acinclude.m4
+sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gxsubs.c
+cp -p %{SOURCE1} .
# README for use with xorg
-cp -p %{SOURCE5} README.xorg
-# fix perms
-chmod a-x src/*.c src/*.h
-chmod a-x COPYRIGHT
-find doc -type f -exec chmod a-x \{\} \;
-find data -type f -exec chmod a-x \{\} \;
+cp -p %{SOURCE2} README.xorg
+autoreconf -f -i
%build
-./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --enable-dyn-supplibs \
+ --without-gui --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"
make %{?_smp_mflags}
@@ -105,10 +78,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc COPYRIGHT __dist_docs/html README.xorg grads-copyright_summary
%{_bindir}/bufrscan
-%{_bindir}/gradsc
-%{_bindir}/gradsdods
-%{_bindir}/gradshdf
-%{_bindir}/gradsnc
+%{_bindir}/grads
%{_bindir}/gribmap
%{_bindir}/gribscan
%{_bindir}/gxeps
@@ -121,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 03 2010 Deji Akingunola <dakingun at gmail.com> - 2.0-0.a9.1
+- Update to 2.0.a9
+- Remove upstreamed patches
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9b4-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index ba510f8..2ed80b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22e04f84df73d4aa72fe468c7f43b1c3 grads-src-free-1.9b4.tar.gz
+2009b3937d1754b173714b133339eb74 grads-2.0.a9-src.tar.gz
More information about the scm-commits
mailing list