[splat] Fixed bz 621371
Randall 'Randy' Berry
dp67 at fedoraproject.org
Thu Aug 5 08:34:17 UTC 2010
commit 20c71d3711ee5753adf74befe8626191e6b084a2
Author: Randall Berry <randyn3lrx at gmail.com>
Date: Thu Aug 5 04:34:12 2010 -0400
Fixed bz 621371
bearing.man | 34 ++++++++++++++++++++++
citydecoder.man | 31 ++++++++++++++++++++
postdownload.man | 41 +++++++++++++++++++++++++++
splat-1.3.0-build-file.patch | 13 --------
splat-1.3.0-build.patch | 21 ++++++++++++++
splat.spec | 63 +++++++++++++++++++++++++++++------------
srtm2sdf.man | 45 ++++++++++++++++++++++++++++++
usgs2sdf.man | 28 ++++++++++++++++++
8 files changed, 244 insertions(+), 32 deletions(-)
---
diff --git a/bearing.man b/bearing.man
new file mode 100644
index 0000000..37fd5d7
--- /dev/null
+++ b/bearing.man
@@ -0,0 +1,34 @@
+.\" Man page for bearing
+.\" Created by copying text from utils/README
+.TH man 1 "30 July 2008" "1.0" "bearing"
+.SH NAME
+bearing \- returns the azimuth bearing and great circle path distance between two specified points
+.SH SYNOPSIS
+.B bearing
+file
+.SH DESCRIPTION
+.B bearing
+reads a pair of .qth files specified on the command
+line, and returns the azimuth bearing and great circle path distance between
+the two points specified. A -metric switch is available so that distances
+can be provided in kilometers rather than statute miles. SPLAT! provides
+similar distance and bearing information between two specific site locations.
+The bearing utility, however, provides the information quickly and easily
+over great distances without having to run SPLAT!
+
+.SH EXAMPLES
+bearing ai4qr.qth 940-repeater.qth
+
+.SH FILES
+.P
+.I /usr/bin/bearing
+.SH SEE ALSO
+.BR splat (1),
+.SH BUGS
+No known bugs at this time.
+.SH AUTHOR
+.nf
+Steve Conklin (fedora at conklinhouse.com)
+.fi
+.SH HISTORY
+2008 \- Text copied from README
diff --git a/citydecoder.man b/citydecoder.man
new file mode 100644
index 0000000..41bb0fa
--- /dev/null
+++ b/citydecoder.man
@@ -0,0 +1,31 @@
+.\" Man page for citydecoder
+.\" Created by copying text from utils/README
+.TH man 1 "09 December 2007" "1.0" "citydecoder"
+.SH NAME
+citydecoder \- Generate city/site data files for use with SPLAT from U.S. Census Bureau files of Incorporated Places/Census
+Designated Places
+.SH SYNOPSIS
+.B citydecoder
+file
+.SH DESCRIPTION
+.B citydecoder
+is an utility that reads U.S. Census Bureau files of Incorporated Places/Census Designated Places, and generates city/site data files for use with SPLAT! software. Files for use with this utility are available for download free of charge from: http://www.census.gov/geo/www/cob/bdy_files.html.
+.P
+Please select the ARC/INFO Ungenerate (ASCII) Metadata Cartographic Boundary Files from this site and unzip them prior to importing them to citydecoder. U.S. Census files are cataloged by the two digit FIPS code for the region (state) they represent. citydecoder takes as an argument the two-letter file prefix plus the FIPS code of the region or state being processed.
+
+.SH EXAMPLES
+citydecoder pl34
+
+.SH FILES
+.P
+.I /usr/bin/citydecoder
+.SH SEE ALSO
+.BR splat (1),
+.SH BUGS
+No known bugs at this time.
+.SH AUTHOR
+.nf
+Sindre Pedersen Bjordal (foolish at guezz.net)
+.fi
+.SH HISTORY
+2007 \- Text copyed from README
diff --git a/postdownload.man b/postdownload.man
new file mode 100644
index 0000000..f3b5a46
--- /dev/null
+++ b/postdownload.man
@@ -0,0 +1,41 @@
+.\" Man page for postdownload
+.\" Created by copying text from utils/README
+.TH man 1 "30 July 2008" "1.0" "postdownload"
+.SH NAME
+postdownload \- A front-end to the usgs2sdf utility
+.SH SYNOPSIS
+.B postdownload
+file
+.SH DESCRIPTION
+.B postdownload
+ is a front-end to the usgs2sdf utility. postdownload
+takes as an argument the name of the gzipped Digital Elevation Model
+(DEM) downloaded from the US Geological Survey (ie: wilmington-w.gz).
+postdownload uncompresses the DEM file, adds necessary record delimiters,
+and invokes usgs2sdf to produce a SPLAT Data File (SDF).
+
+.P
+USGS Digital Elevation Models may be downloaded from:
+
+ http://edcftp.cr.usgs.gov/pub/data/DEM/250/
+
+Invoke postdownload with the name of each DEM file downloaded to
+produce a database of SPLAT Data Files.
+
+
+.SH EXAMPLES
+postdownload aberdeen
+
+.SH FILES
+.P
+.I /usr/bin/postdownload
+.SH SEE ALSO
+.BR splat (1),
+.SH BUGS
+No known bugs at this time.
+.SH AUTHOR
+.nf
+Steve Conklin (fedora at conklinhouse.com)
+.fi
+.SH HISTORY
+2008 \- Text copied from README
diff --git a/splat-1.3.0-build.patch b/splat-1.3.0-build.patch
new file mode 100644
index 0000000..3a844ac
--- /dev/null
+++ b/splat-1.3.0-build.patch
@@ -0,0 +1,21 @@
+diff -up ./build.diff ./build
+--- ./build.diff 2009-03-14 12:12:35.000000000 -0400
++++ ./build 2010-08-05 02:10:54.809868664 -0400
+@@ -23,7 +23,7 @@ build_splat()
+ fi
+
+ echo -n "Compiling SPLAT!... "
+- g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat
++ g++ -ffast-math $RPM_OPT_FLAGS itm.cpp splat.cpp -lm -lbz2 -o splat
+
+ if [ -x splat ]; then
+ echo "Done!"
+@@ -34,7 +34,7 @@ build_splat()
+ if [ -r hd-parms.h ]; then
+ cp hd-parms.h splat.h
+ echo -n "Compiling SPLAT! HD... "
+- g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat-hd
++ g++ -ffast-math $RPM_OPT_FLAGS itm.cpp splat.cpp -lm -lbz2 -o splat
+
+ if [ -x splat-hd ]; then
+ echo "Done!"
diff --git a/splat.spec b/splat.spec
index 68c2cf4..246e429 100644
--- a/splat.spec
+++ b/splat.spec
@@ -1,24 +1,30 @@
-Name: splat
-Version: 1.3.0
-Release: 1%{?dist}
-
-Provides: splat-utils = %{version}-%{release}
-Obsoletes: splat-utils < 1.2.3-7
-
-Summary: Analyze point-to-point terrestrial RF communication links
-
-Group: Applications/Communications
-License: GPLv2+
-URL: http://www.qsl.net/kd2bd/splat.html
-Source0: http://www.qsl.net/kd2bd/%{name}-%{version}.tar.bz2
+Name: splat
+Version: 1.3.0
+Release: 2%{?dist}
+
+Provides: splat-utils = %{version}-%{release}
+Obsoletes: splat-utils < 1.2.3-7
+
+Summary: Analyze point-to-point terrestrial RF communication links
+
+Group: Applications/Communications
+License: GPLv2+
+URL: http://www.qsl.net/kd2bd/splat.html
+Source0: http://www.qsl.net/kd2bd/%{name}-%{version}.tar.bz2
+#man pages for utilities, generated from utils README file
+Source1: citydecoder.man
+Source2: srtm2sdf.man
+Source3: usgs2sdf.man
+Source4: bearing.man
+Source5: postdownload.man
# Build flags patch
-Patch0: splat-1.3.0-build-file.patch
+Patch0: splat-1.3.0-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: bzip2-devel
-BuildRequires: groff
-BuildRequires: desktop-file-utils
+BuildRequires: bzip2-devel
+BuildRequires: groff
+BuildRequires: zlib-devel
%description
SPLAT! is a Surface Path Length And Terrain analysis application written for
@@ -39,10 +45,20 @@ designers and site engineers.
%install
rm -rf $RPM_BUILD_ROOT
+
+#build additional man pages
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
+groff -e -T ascii -man %{SOURCE1} > $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1
+groff -e -T ascii -man %{SOURCE2} > $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1
+groff -e -T ascii -man %{SOURCE3} > $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1
+groff -e -T ascii -man %{SOURCE4} > $RPM_BUILD_ROOT%{_mandir}/man1/bearing.1
+groff -e -T ascii -man %{SOURCE5} > $RPM_BUILD_ROOT%{_mandir}/man1/postdownload.1
+
#manual install, easier than patching upstream custom install script
-install -D -m 0755 splat $RPM_BUILD_ROOT%{_bindir}/splat
+install -D -m 0755 splat $RPM_BUILD_ROOT%{_bindir}/%{name}
install -D -m 0644 docs/english/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/man1/splat.1
install -D -m 0644 docs/spanish/man/splat.1 $RPM_BUILD_ROOT%{_mandir}/es/man1/splat.1
+
#utils
install -D -m 0755 utils/citydecoder $RPM_BUILD_ROOT%{_bindir}/citydecoder
install -D -m 0755 utils/bearing $RPM_BUILD_ROOT%{_bindir}/bearing
@@ -53,6 +69,8 @@ install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf
#rename this to avoid conflict with main readme
mv utils/README utils/README-utils
+# CLI No .desktop
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -66,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
+* Thu Aug 5 2010 Randall J. Berry <dp67 at fedoraproject.org> - 1.3.0-2
+- Build with $RPM_OPT_FLAGS bz #621371
+- Remove unnecessary BuildRequires: desktop-file-utils
+- Add additional man pages
+- Added BuildRequires: zlib-devel for fontdata bz #621371
+- Replace non-ascii characters in man pages
+
* Sun Aug 1 2010 Randall J. Berry <dp67 at fedoraproject.org> - 1.3.0-1
- Upstream update 1.3.0
- Rebuild for F13/F14/Devel
diff --git a/srtm2sdf.man b/srtm2sdf.man
new file mode 100644
index 0000000..73bd758
--- /dev/null
+++ b/srtm2sdf.man
@@ -0,0 +1,45 @@
+.\" Man page for srtm2sdf
+.\" Created by copying text from utils/README
+.TH man 1 "09 December 2007" "1.0" "srtm2sdf"
+.SH NAME
+srtm2sdf \- Generate SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files.
+.SH SYNOPSIS
+.B srtm2sdf
+[options]
+file
+.SH DESCRIPTION
+.B srtm2sdf
+is a utility that generates SPLAT Data Files (SDFs) from 3-arc second STS-99 Space Shuttle Topography Mission (SRTM-3) elevation data files. This data is of a much higher quality than that contained in older USGS Digital Elevation Models of the same resolution. However, many SRTM-3 Version 2 elevation models contain data "voids" and "wells" that are the consequence of the radar mapping process.
+.P
+The srtm2sdf utility has the ability to detect and replace SRTM data outliers with equivalent SDF data created through the usgs2sdf utility (below). If equivalent USGS-derived SPLAT Data Files are not available, SRTM outliers are handled either through adjacent pixel averaging, or by threshold limiting using user-specified limits. Of all three methods, the USGS-derived SDF replacement method yields the best results.
+
+.SH OPTIONS
+The srtm2sdf utility accepts command-line options as follows:
+.P
+.IP -d
+used to specify the directory path to the location of existing SDF files The -d option overridesthe default path specified in your $HOME/.splat_path file.
+.P
+.IP -n
+used to specify the elevation (in meters) below which SRTM data is replaced. Below this limit, SRTM elevation data is either replaced using existing SDF equivalent files, or averaged among adjacent elevation data points. The default threshold for the replacement limit is sea-level (0 meters). Unless elevations below sea-level are known to exist for the region being processed by the srtm2sdf utility, the -n option need not be specified.
+.SH EXAMPLES
+srtm2sdf \ N40W074.hgt
+.P
+srtm2sdf \-d /cdrom/sdf N40W074.hgt
+.P
+srtm2sdf \-d /dev/null N40W074.hgt
+.P (/dev/null prevents USGS data replacement from taking place)
+srtm2sdf \-n \-5 N40W074.hgt
+
+.SH FILES
+.P
+.I /usr/bin/srtm2sdf
+.SH SEE ALSO
+.BR splat (1),
+.SH BUGS
+No known bugs at this time.
+.SH AUTHOR
+.nf
+Sindre Pedersen Bjordal (foolish at guezz.net)
+.fi
+.SH HISTORY
+2007 \- Text copyed from README
diff --git a/usgs2sdf.man b/usgs2sdf.man
new file mode 100644
index 0000000..453b26a
--- /dev/null
+++ b/usgs2sdf.man
@@ -0,0 +1,28 @@
+.\" Man page for usgs2sdf
+.\" Created by copying text from utils/README
+.TH man 1 "09 December 2007" "1.0" "usgs2sdf"
+.SH NAME
+usgs2sdf \- Generate SPLAT Data Files (SDFs) from uncompressed delimited Digital Elevation Model Data from the US Geological Survey
+Designated Places
+.SH SYNOPSIS
+.B usgs2sdf
+file
+.SH DESCRIPTION
+The
+.B usgs2sdf
+utility takes as an argument the name of an uncompressed delimited Digital Elevation Model Data (DEM) downloaded from the US Geological Survey, and generates a SPLAT Data File (SDF) compatible with SPLAT! Software.
+.SH EXAMPLES
+usgs2sdf wilmington-e
+.SH FILES
+.P
+.I /usr/bin/usgs2sdf
+.SH SEE ALSO
+.BR splat (1),
+.SH BUGS
+No known bugs at this time.
+.SH AUTHOR
+.nf
+Sindre Pedersen Bjordal (foolish at guezz.net)
+.fi
+.SH HISTORY
+2007 \- Text copyed from README
More information about the scm-commits
mailing list