[splat] * Sat Aug 7 2010 Randall J. Berry <dp67 at fedoraproject.org> - 1.3.0-3 - Added more macros to name an
Randall 'Randy' Berry
dp67 at fedoraproject.org
Sat Aug 7 09:54:21 UTC 2010
commit 36c16515cc6dd98711d9a2183aebce9954e924d7
Author: Randall Berry <randyn3lrx at gmail.com>
Date: Sat Aug 7 05:51:05 2010 -0400
* Sat Aug 7 2010 Randall J. Berry <dp67 at fedoraproject.org> - 1.3.0-3
- Added more macros to name and version.
- Cleanup spec
- Patch build file in utils with rpm_opt_flags
- Left rm -rf RPM_BUILD_ROOT for potential EPEL build
splat-1.3.0-build.patch | 48 +++++++++++++++++++++++++++++++++++++++++++++++
splat.spec | 40 ++++++++++++++++++++++----------------
2 files changed, 71 insertions(+), 17 deletions(-)
---
diff --git a/splat-1.3.0-build.patch b/splat-1.3.0-build.patch
index 3a844ac..7e9d34f 100644
--- a/splat-1.3.0-build.patch
+++ b/splat-1.3.0-build.patch
@@ -19,3 +19,51 @@ diff -up ./build.diff ./build
if [ -x splat-hd ]; then
echo "Done!"
+diff -up ./utils/build.diff ./utils/build
+--- ./utils/build.diff 2009-03-14 12:13:25.000000000 -0400
++++ ./utils/build 2010-08-06 03:36:44.615867835 -0400
+@@ -7,7 +7,7 @@
+ build_citydecoder()
+ {
+ echo -n "Compiling citydecoder... "
+- cc -Wall -O3 -fomit-frame-pointer citydecoder.c -o citydecoder
++ cc $RPM_OPT_FLAGS -fomit-frame-pointer citydecoder.c -o citydecoder
+
+ if [ -x citydecoder ]; then
+ echo "Done!"
+@@ -19,7 +19,7 @@ build_citydecoder()
+ build_usgs2sdf()
+ {
+ echo -n "Compiling usgs2sdf... "
+- cc -Wall -O3 -fomit-frame-pointer usgs2sdf.c -o usgs2sdf
++ cc $RPM_OPT_FLAGS -fomit-frame-pointer usgs2sdf.c -o usgs2sdf
+
+ if [ -x usgs2sdf ]; then
+ echo "Done!"
+@@ -31,7 +31,7 @@ build_usgs2sdf()
+ build_srtm2sdf()
+ {
+ echo -n "Compiling srtm2sdf... "
+- cc -Wall -O3 -fomit-frame-pointer srtm2sdf.c -lbz2 -o srtm2sdf
++ cc $RPM_OPT_FLAGS -fomit-frame-pointer srtm2sdf.c -lbz2 -o srtm2sdf
+ rm -f srtm2sdf-hd
+ ln -s srtm2sdf srtm2sdf-hd
+
+@@ -46,7 +46,7 @@ build_srtm2sdf()
+ build_fontdata()
+ {
+ echo -n "Compiling fontdata... "
+- cc -Wall -O3 -lz -fomit-frame-pointer fontdata.c -o fontdata
++ cc $RPM_OPT_FLAGS -lz -fomit-frame-pointer fontdata.c -o fontdata
+
+ if [ -x fontdata ]; then
+ echo "Done!"
+@@ -59,7 +59,7 @@ build_fontdata()
+ build_bearing()
+ {
+ echo -n "Compiling bearing... "
+- cc -Wall -O3 -fomit-frame-pointer -lm bearing.c -o bearing
++ cc $RPM_OPT_FLAGS -fomit-frame-pointer -lm bearing.c -o bearing
+
+ if [ -x bearing ]; then
+ echo "Done!"
diff --git a/splat.spec b/splat.spec
index 246e429..a1f4e12 100644
--- a/splat.spec
+++ b/splat.spec
@@ -1,6 +1,6 @@
Name: splat
Version: 1.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Provides: splat-utils = %{version}-%{release}
Obsoletes: splat-utils < 1.2.3-7
@@ -9,16 +9,16 @@ Summary: Analyze point-to-point terrestrial RF communication links
Group: Applications/Communications
License: GPLv2+
-URL: http://www.qsl.net/kd2bd/splat.html
+URL: http://www.qsl.net/kd2bd/%{name}.html
Source0: http://www.qsl.net/kd2bd/%{name}-%{version}.tar.bz2
-#man pages for utilities, generated from utils README file
+# 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.patch
+Patch0: %{name}-%{version}-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,19 +34,19 @@ designers and site engineers.
%prep
%setup -q
-%patch0 -p1 -b .ppc
+%patch0 -p1 -b %{name}-%{version}-build.patch
-#fix end of line encoding
-%{__sed} -i 's/\r//' utils/fips.txt
+# Fix end of line encoding
+sed -i 's/\r//' utils/fips.txt
%build
-#uses custom build scripts
+# Uses custom build scripts
./build all
%install
+# Left in for potential EPEL compatibility
rm -rf $RPM_BUILD_ROOT
-
-#build additional man pages
+# 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
@@ -54,27 +54,27 @@ 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}/%{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
+# Manual install, easier than patching upstream custom install script
+install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -D -m 0644 docs/english/man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+install -D -m 0644 docs/spanish/man/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/es/man1/%{name}.1
-#utils
+# Install utils
install -D -m 0755 utils/citydecoder $RPM_BUILD_ROOT%{_bindir}/citydecoder
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
-#rename this to avoid conflict with main readme
+# Rename this to avoid conflict with main readme
mv utils/README utils/README-utils
# CLI No .desktop
+# Clean section left in for potential EPEL compatibility
%clean
rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
%doc CHANGES COPYING README utils/README-utils utils/fips.txt
@@ -84,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
+* Sat Aug 7 2010 Randall J. Berry <dp67 at fedoraproject.org> - 1.3.0-3
+- Added more macros to name and version.
+- Cleanup spec
+- Patch build file in utils with rpm_opt_flags
+- Left rm -rf RPM_BUILD_ROOT for potential EPEL build
+
* 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
More information about the scm-commits
mailing list