rpms/splat/F-7 citydecoder.man, NONE, 1.1 splat-1.2-build.patch, NONE, 1.1 splat-1.2-gcc.patch, NONE, 1.1 splat-1.2-parens.patch, NONE, 1.1 splat.spec, NONE, 1.1 srtm2sdf.man, NONE, 1.1 usgs2sdf.man, NONE, 1.1 sources, 1.1, 1.2

Robert 'Bob' Jensen (bjensen) fedora-extras-commits at redhat.com
Sun Mar 2 21:37:13 UTC 2008


Author: bjensen

Update of /cvs/pkgs/rpms/splat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19219

Modified Files:
	sources 
Added Files:
	citydecoder.man splat-1.2-build.patch splat-1.2-gcc.patch 
	splat-1.2-parens.patch splat.spec srtm2sdf.man usgs2sdf.man 
Log Message:
* Thu Feb 28 2008 Steve Conklin <sconklin at redhat dot com> - 1.2.1-6
- Silly, there's no gui. Removed desktop and icon files.



--- NEW FILE citydecoder.man ---
.\" 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 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 Bjørdal (foolish at guezz.net)
.fi
.SH HISTORY
2007 \- Text copyed from README

splat-1.2-build.patch:

--- NEW FILE splat-1.2-build.patch ---
diff -up splat-1.2.1/build.spc splat-1.2.1/build
--- splat-1.2.1/build.spc	2008-02-26 20:31:34.000000000 -0600
+++ splat-1.2.1/build	2008-02-26 20:37:44.000000000 -0600
@@ -8,13 +8,19 @@ cpu=`uname -m`
 
 if [ $cpu == "x86_64" ]; then
         cpu="x86-64"
+elif [ $cpu == "ppc" ]; then 
+    MARCH = ""
+elif [ $cpu == "ppc64" ]; then 
+    MARCH = ""
+else
+    MARCH = " -march=$cpu "
 fi
 
 build_splat()
 {
 	echo -n "Compiling SPLAT!... "
 	## g++ -Wall -O3 -s -lm -lbz2 -fomit-frame-pointer -march=$cpu itm.cpp splat.cpp -o splat
-	g++ -Wall -O3 -fomit-frame-pointer -ffast-math -march=$cpu itm.cpp splat.cpp -lm -lbz2 -o splat
+	g++ -Wall -O3 -fomit-frame-pointer -ffast-math $MARCH itm.cpp splat.cpp -lm -lbz2 -o splat
 	echo "Done!"
 }
 

splat-1.2-gcc.patch:

--- NEW FILE splat-1.2-gcc.patch ---
diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp
--- splat-1.2.1/splat.cpp.spc	2008-02-25 12:17:10.000000000 -0600
+++ splat-1.2.1/splat.cpp	2008-02-25 12:17:50.000000000 -0600
@@ -6036,7 +6036,7 @@ void WriteKML(struct site source, struct
 	fflush(stdout);
 }
 
-int main(char argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	int		x, y, z=0, min_lat, min_lon, max_lat, max_lon,
 			rxlat, rxlon, txlat, txlon, west_min, west_max,

splat-1.2-parens.patch:

--- NEW FILE splat-1.2-parens.patch ---
diff -up splat-1.2.1/splat.cpp.spc splat-1.2.1/splat.cpp
--- splat-1.2.1/splat.cpp.spc	2008-02-26 20:47:36.000000000 -0600
+++ splat-1.2.1/splat.cpp	2008-02-26 20:49:16.000000000 -0600
@@ -2799,7 +2799,7 @@ void PlotLRPath(struct site source, stru
 
 			/* Mark this point as being analyzed */
 
-			PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+mask_value<<3);
+			PutMask(path.lat[y],path.lon[y],(GetMask(path.lat[y],path.lon[y])&7)+(mask_value<<3));
 		}
 	}
 }


--- NEW FILE splat.spec ---
Name:           splat
Version:        1.2.1
Release:        6%{?dist}
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.ibiblio.org/pub/linux/apps/ham/%{name}-%{version}.tar.bz2
#man pages for utilities, generated from utils README file
Source1:        citydecoder.man
Source2:        srtm2sdf.man
Source3:        usgs2sdf.man
Patch0:		splat-1.2-gcc.patch
Patch1:		splat-1.2-build.patch
Patch2:		splat-1.2-parens.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  bzip2-devel
BuildRequires:  groff, desktop-file-utils
#Requires:       

%description
SPLAT! is a Surface Path Length And Terrain analysis application written for
Linux and Unix workstations. SPLAT! analyzes point-to-point terrestrial RF 
communication links, and provides information useful to communication system
designers and site engineers.

%package utils
Summary:       Utilities for use with SPLAT!
Group:         Applications/Communications
Requires:      %{name} = %{version}-%{release}

%description utils
Utilities for use with SPLAT!

Includes: 
citydecoder
srtm2sdf
usg2sdf


%prep
%setup -q
%patch0 -p1 -b .gcc
%patch1 -p1 -b .ppc
%patch2 -p1 -b .parens

#fix end of line encoding
%{__sed} -i 's/\r//' utils/fips.txt

%build
#uses custom build scripts
./build all

#build additional man pages
groff -e -T ascii -man %{SOURCE1} > $RPM_BUILD_DIR/%{name}-%{version}/utils/citydecoder.1
groff -e -T ascii -man %{SOURCE2} > $RPM_BUILD_DIR/%{name}-%{version}/utils/srtm2sdf.1
groff -e -T ascii -man %{SOURCE3} > $RPM_BUILD_DIR/%{name}-%{version}/utils/usgs2sdf.1

%install
rm -rf $RPM_BUILD_ROOT
#manual install, easier than patching upstream custom install script
install -D -m 0755 splat $RPM_BUILD_ROOT%{_bindir}/splat
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/usgs2sdf $RPM_BUILD_ROOT%{_bindir}/usgs2sdf
install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf
#additional man pagers
install -D -m 0644 utils/citydecoder.1 $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1
install -D -m 0644 utils/srtm2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/srtm2sdf.1
install -D -m 0644 utils/usgs2sdf.1 $RPM_BUILD_ROOT%{_mandir}/man1/usgs2sdf.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README
%doc sample_data
%{_bindir}/splat
%{_mandir}/man?/splat*
%{_mandir}/es/man?/splat*

%files utils
%doc COPYING utils/README utils/fips.txt
%{_bindir}/citydecoder
%{_bindir}/srtm2sdf
%{_bindir}/usgs2sdf
%{_mandir}/man?/citydecoder*
%{_mandir}/man?/srtm2sdf*
%{_mandir}/man?/usgs2sdf*

%changelog
* Thu Feb 28 2008 Steve Conklin <sconklin at redhat dot com> - 1.2.1-6
- Silly, there's no gui. Removed desktop and icon files.

* Thu Feb 28 2008 Steve Conklin <sconklin at redhat dot com> - 1.2.1-5
- installed desktop and icon files with main package, not utils

* Tue Feb 26 2008 Steve Conklin <sconklin at redhat dot com> - 1.2.1-4
- removed erroneous -march flag for ppc

* Mon Feb 25 2008 Steve Conklin <sconklin at redhat dot com> - 1.2.1-3
- Fixed declaration that the new gcc didn't like

* Tue Feb 19 2008 Steve Conklin <sconklin at redhat dot com> - 1.2.1-2
- Added desktop file and icon

* Sun Dec 09 2007 Sindre Pedersen Bjørdal - 1.2.1-1
- Initial Build


--- NEW FILE srtm2sdf.man ---
.\" 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 Bjørdal (foolish at guezz.net)
.fi
.SH HISTORY
2007 \- Text copyed from README


--- NEW FILE usgs2sdf.man ---
.\" 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/splat/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Mar 2008 17:24:36 -0000	1.1
+++ sources	2 Mar 2008 21:36:38 -0000	1.2
@@ -0,0 +1 @@
+46a223f7db0d59dc79dd5467cdebf14d  splat-1.2.1.tar.bz2




More information about the fedora-extras-commits mailing list