[splat/f14/master] Fixed bz 621371

[Randall 'Randy' Berry]

commit d79bd18ff8d9ee6a14ce22851f7297342b48d466
Author: Randall Berry <randyn3lrx at gmail.com>
Date:   Thu Aug 5 04:40:34 2010 -0400

    Fixed bz 621371

 splat.spec |   63 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 44 insertions(+), 19 deletions(-)
---
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