[splat] Take ownership of orphan package, update to current upstream 1.3.0

Randall 'Randy' Berry dp67 at fedoraproject.org
Sun Aug 1 21:57:03 UTC 2010


commit 9fb1fcc7ec520ae24d9241cd222a762bd2e79c7b
Author: Randall Berry <randyn3lrx at gmail.com>
Date:   Sun Aug 1 17:56:57 2010 -0400

    Take ownership of orphan package, update to current upstream 1.3.0

 .gitignore                   |    1 +
 bearing.man                  |   34 -------------------------------
 citydecoder.man              |   31 ----------------------------
 postdownload.man             |   41 --------------------------------------
 sources                      |    2 +-
 splat-1.2-build.patch        |   24 ----------------------
 splat-1.2.3-optflags.patch   |   12 -----------
 splat-1.3.0-build-file.patch |   13 ++++++++++++
 splat.spec                   |   42 ++++++++++++++-------------------------
 srtm2sdf.man                 |   45 ------------------------------------------
 usgs2sdf.man                 |   28 --------------------------
 11 files changed, 30 insertions(+), 243 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2806a1b..dd35f79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 splat-1.2.1.tar.bz2
 splat-1.2.3.tar.bz2
+splat-1.3.0.tar.bz2
diff --git a/sources b/sources
index d7ec02d..88c3a8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48e1c8b71e18b843066c625ed3068a1b  splat-1.2.3.tar.bz2
+0b45c9d8fbb1a7c87fbc013d332e1bc7  splat-1.3.0.tar.bz2
diff --git a/splat-1.3.0-build-file.patch b/splat-1.3.0-build-file.patch
new file mode 100644
index 0000000..5c6cb64
--- /dev/null
+++ b/splat-1.3.0-build-file.patch
@@ -0,0 +1,13 @@
+diff -up ./build.orig ./build
+--- ./build.orig	2009-03-14 12:12:35.000000000 -0400
++++ ./build	2010-08-01 17:24:55.589310976 -0400
+@@ -34,7 +34,8 @@ 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 66cb416..68c2cf4 100644
--- a/splat.spec
+++ b/splat.spec
@@ -1,9 +1,9 @@
 Name:           splat
-Version:        1.2.3
-Release:        7%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 
 Provides:       splat-utils = %{version}-%{release}
-Obsoletes:      splat-utils < 1.2.3-2
+Obsoletes:      splat-utils < 1.2.3-7
 
 Summary:        Analyze point-to-point terrestrial RF communication links
 
@@ -11,19 +11,14 @@ 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
-Patch0:		splat-1.2.3-optflags.patch
+# Build flags patch
+Patch0:		splat-1.3.0-build-file.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bzip2-devel
 BuildRequires:  groff
-BuildRequires:	desktop-file-utils
-#Requires:       
+BuildRequires:	desktop-file-utils       
 
 %description
 SPLAT! is a Surface Path Length And Terrain analysis application written for
@@ -42,13 +37,6 @@ designers and site engineers.
 #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
-groff -e -T ascii -man %{SOURCE4} > $RPM_BUILD_DIR/%{name}-%{version}/utils/bearing.1
-groff -e -T ascii -man %{SOURCE5} > $RPM_BUILD_DIR/%{name}-%{version}/utils/postdownload.1
-
 %install
 rm -rf $RPM_BUILD_ROOT
 #manual install, easier than patching upstream custom install script
@@ -61,12 +49,6 @@ install -D -m 0755 utils/bearing $RPM_BUILD_ROOT%{_bindir}/bearing
 install -D -m 0755 utils/postdownload $RPM_BUILD_ROOT%{_bindir}/postdownload
 install -D -m 0755 utils/usgs2sdf $RPM_BUILD_ROOT%{_bindir}/usgs2sdf
 install -D -m 0755 utils/srtm2sdf $RPM_BUILD_ROOT%{_bindir}/srtm2sdf
-#additional man pages
-install -D -m 0644 utils/citydecoder.1 $RPM_BUILD_ROOT%{_mandir}/man1/citydecoder.1
-install -D -m 0644 utils/bearing.1 $RPM_BUILD_ROOT%{_mandir}/man1/bearing.1
-install -D -m 0644 utils/postdownload.1 $RPM_BUILD_ROOT%{_mandir}/man1/postdownload.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
 
 #rename this to avoid conflict with main readme
 mv utils/README utils/README-utils
@@ -80,10 +62,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING README utils/README-utils utils/fips.txt
 %doc sample_data
 %{_bindir}/*
-%{_mandir}/es/man?/splat*
-%{_mandir}/man?/*
+%{_mandir}/es/man1/*
+%{_mandir}/man1/*
 
 %changelog
+* 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
+- Clean up spec.
+- Several files changed on newer version.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list