Enable PulseAudio support per bug 554198

.cvsignore

@@ -1 +1 @@
-fldigi-3.11.6.tar.gz
+fldigi-3.12.5.tar.gz

fldigi.spec

@@ -1,19 +1,16 @@
 Name:		fldigi
-Version:	3.11.6
-Release:	3%{?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" LIBS="-lm -lX11"
+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,20 @@ 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@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@jcomserv.net> - 3.11.6-3
 - Correction for X11 DSO linking FTBFS, BZ 565116.
 

import.log

@@ -1,2 +1,3 @@
 fldigi-3_10-1_fc10:HEAD:fldigi-3.10-1.fc10.src.rpm:1232416769
 fldigi-3_11_6-1_fc11:HEAD:fldigi-3.11.6-1.fc11.src.rpm:1247727524
+fldigi-3_12_5-1_fc13:HEAD:fldigi-3.12.5-1.fc13.src.rpm:1271979744

sources

@@ -1 +1 @@
-912ddc303ca54b9e41e8c271c6160bbc  fldigi-3.11.6.tar.gz
+ec8c8519bb64ed29496cd9f3f71a9d57  fldigi-3.12.5.tar.gz