rpms/fldigi/F-12 fldigi.spec,1.13,1.14 sources,1.9,1.10

Fri Apr 23 00:44:39 UTC 2010

Author: dp67

Update of /cvs/pkgs/rpms/fldigi/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11252

Modified Files:
	fldigi.spec sources 
Log Message:

Upstream update to 3.12.5
Fix bug 562515 does not support PulseAudio
Deps included for PulseAudio Support



Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-12/fldigi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14

--- fldigi.spec	24 Jul 2009 22:52:51 -0000	1.13
+++ fldigi.spec	23 Apr 2010 00:44:39 -0000	1.14
@@ -1,19 +1,16 @@
 Name:		fldigi
-Version:	3.11.6
-Release:	2%{?dist}
+Version:	3.12.5
+Release:	1%{?dist}
 Summary:	Digital modem program for Linux
-
 Group:		Applications/Communications
 License:	GPLv2+	
 URL:		http://www.w1hkj.com/fldigi-distro/
 Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
-
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The package should be updated to current, patch re-diffed and send upstream!
 # Commented out 07-16-2009 patch applied upstream 3.11.6
 # Patch0:	%{name}-gcc44.patch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:	hamlib-devel
 BuildRequires:	fltk-devel
 BuildRequires:	libjpeg-devel
@@ -22,18 +19,21 @@ BuildRequires:	portaudio-devel >= 19-4
 BuildRequires:	libsndfile-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	libsamplerate-devel
+BuildRequires:	pulseaudio-libs-devel
+BuildRequires:	xmlrpc-c-devel
+
 
 %description
 fldigi is a modem program which supports most of the digital modes used by 
-hamradio operators today. You can also use the program for calibrating your 
-sound card to WWV or doing a frequency measurment test. The program also comes 
+ham radio operators today. You can also use the program for calibrating your 
+sound card to WWV or doing a frequency measurement test. The program also comes 
 with a CW decoder. fldigi is written with the help of the Fast Light Toolkit X 
 GUI.
 
 %prep
 %setup -q
 # %patch0
-# Remove executeable tag to quiet rpmlint
+# Remove executeable tags to quiet rpmlint
 chmod -x src/include/jalocha/pj_struc.h
 chmod -x src/include/jalocha/pj_fifo.h
 chmod -x src/include/jalocha/pj_cmpx.h
@@ -46,14 +46,15 @@ chmod -x src/include/jalocha/pj_mfsk.h
 
 %build
 %configure
-make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+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 \
-  $RPM_BUILD_ROOT%{_datadir}/applications/fldigi.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
+$RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop
 # --vendor obsolete per new guidlines but leaving it in because
 # this is an existing package with vendor previously installed
 %find_lang %{name}
@@ -67,9 +68,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}-shell.1.gz
+%{_mandir}/man1/flarq.1.gz
+%attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
+
 %changelog
+* Thu Apr 22 2010 Randall J. Berry <dp67 at fedoraproject.com> 3.12.5-1
+- Upstream upgrade to 3.12.5
+- Apply changes to spec to include pulseaudio as in bug 562515
+- Added Buildeps pulseaudio-libs-devel, xmlrpc-c-devel (bug 562515)
+- Added manpage generated by builddeps (bug 562515)
+- Corrected spelling in description (bug 562515)
+
+* Thu Apr 22 2010 Jon Ciesla <limb at jcomserv.net> - 3.11.6-3
+- Correction for X11 DSO linking FTBFS, BZ 565116.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 Jul 2009 06:59:52 -0000	1.9
+++ sources	23 Apr 2010 00:44:39 -0000	1.10
@@ -1 +1 @@
-912ddc303ca54b9e41e8c271c6160bbc  fldigi-3.11.6.tar.gz
+ec8c8519bb64ed29496cd9f3f71a9d57  fldigi-3.12.5.tar.gz

