[fldigi] fldigi finally builds for Rawhide

Randall 'Randy' Berry dp67 at fedoraproject.org
Tue Jan 3 06:08:30 UTC 2012


commit 594ad9b5f094bef7a35de513ce40274d68031203
Author: dp67 <dp67 at fedoraproject.org>
Date:   Tue Jan 3 01:08:27 2012 -0500

    fldigi finally builds for Rawhide

 .gitignore                      |    1 +
 fldigi-3.21.11-global.cxx.patch |   15 ----------
 fldigi-3.21.11-panel.cxx.patch  |   59 ---------------------------------------
 fldigi.spec                     |   25 ++++++++++++----
 sources                         |    2 +-
 5 files changed, 20 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 158cd94..3bdf1ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ fldigi-3.20.20.tar.gz
 /fldigi-3.21.9.tar.gz
 /fldigi-3.21.11.tar.gz
 /fldigi-3.21.16.tar.gz
+/fldigi-3.21.34.tar.gz
diff --git a/fldigi.spec b/fldigi.spec
index 0577e01..0379ade 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,11 +1,12 @@
 Name:		fldigi
-Version:	3.21.16
+Version:	3.21.34
 Release:	2%{?dist}
 Summary:	Digital modem program for Linux
 Group:		Applications/Communications
 License:	GPLv3+	
 URL:		http://www.w1hkj.com/Fldigi.html
-Source0:	http://www.w1hkj.com/downloads/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://www.w1hkj.com/alpha/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	hamlib-devel
 BuildRequires:	fltk-devel
@@ -44,11 +45,13 @@ exported by fldigi, and also defines some useful commands of its own.
 # Fix spurious executeable
 chmod 644 ./src/olivia/olivia.cxx
 
+
 %build
 %configure
 make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread"
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor="" \
 	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -63,6 +66,9 @@ $RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop
 # Remove INSTALL file has no relevance to Fedora package install.
 rm INSTALL
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README NEWS
@@ -76,11 +82,16 @@ rm INSTALL
 %attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 
 %changelog
-* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 3.21.16-2
-- Rebuild for new libpng
-
-* Tue Oct 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 3.21.16-1
-- Update to 3.21.16 and cleanup spec file
+* Mon Jan 2 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.34-2
+- Test Build Against FLTK 1.3
+* Thu Dec 28 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.34-1
+- Test Build Against FLTK 1.3
+- Remove patches
+* Fri Sep 9 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.14-2
+- Testing apply patches for panel.cxx
+* Fri Sep 9 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.14-1
+- Upstream update to 3.21.14
+- Remove patch applied upstream
 * Sun Jun 12 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.11-4
 - Correct my mistake in update request.
 * Sun Jun 12 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.11-4
diff --git a/sources b/sources
index aff042f..c65d314 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9af31f9ea08dd3ad7267b72c968965f8  fldigi-3.21.16.tar.gz
+a10705cd68c3f0a58f73bab3fc2492fb  fldigi-3.21.34.tar.gz


More information about the scm-commits mailing list