dist-git conversion

#2781)

.cvsignore

@@ -1,5 +0,0 @@
-fldigi-2.09.tar.gz
-fldigi-2.10.tar.gz
-fldigi-2.10.2.tar.gz
-fldigi-2.10.3.tar.gz
-fldigi-3.01.tar.gz

.gitignore

@@ -0,0 +1 @@
+fldigi-3.10.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: fldigi
-# $Id$
-NAME := fldigi
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

fldigi.spec

@@ -1,18 +1,27 @@
-Name:           fldigi
-Version:        3.01
-Release:        1%{?dist}
-Summary:        Digital modem program for Linux
+Name:		fldigi
+Version:	3.11.6
+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)
+Group:		Applications/Communications
+License:	GPLv2+	
+URL:		http://www.w1hkj.com/fldigi-distro/
+Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
 
-BuildRequires:  hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
-BuildRequires:  portaudio-devel >= 19-4, libsndfile-devel , desktop-file-utils
-BuildRequires:	libsamplerate, libsamplerate-devel
-Requires:	libsamplerate
+# 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
+BuildRequires:	libpng-devel
+BuildRequires:	portaudio-devel >= 19-4
+BuildRequires:	libsndfile-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	libsamplerate-devel
 
 %description
 fldigi is a modem program which supports most of the digital modes used by 
@@ -23,32 +32,57 @@ GUI.
 
 %prep
 %setup -q
-
+# %patch0
+# Remove executeable tag 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
+chmod -x src/include/jalocha/pj_fft.h
+chmod -x src/include/jalocha/pj_gray.h
+chmod -x src/include/jalocha/pj_lowpass3.h
+chmod -x src/include/jalocha/pj_fht.h
+chmod -x src/olivia/olivia.cxx
+chmod -x src/include/jalocha/pj_mfsk.h
 
 %build
 %configure
-make %{?_smp_mflags}
-
+make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor="" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/fldigi.desktop
+# --vendor obsolete per new guidlines but leaving it in because
+# this is an existing package with vendor previously installed
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/*
 %{_datadir}/pixmaps/*
+%{_mandir}/man1/%{name}.1.gz
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Thu Jul 16 2009 Randall J. Berry <dp67@fedoraproject.com> 3.11.6-1
+- Upstream upgrade to 3.11.6
+- Remove fldigi-gcc44.patch (applied upstream)
+- Man pages added upstream
+* Sat Apr 25 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 3.10-3
+- Fix FTBFS: added fldigi-gcc44.patch
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Jan 19 2009 Randall J Berry 'Dp67' <dp67@fedoraproject.org> 3.10-1
+- New upstream release
+* Thu Dec 14 2008 Sindre Pedersen Bjørdal <sindrepb@fedoraproject.org> 3.03-1
+- New upstream release
+- Remove explicit libsamplerate dependency
 * Fri Aug 22 2008 Steve Conklin <fedora@conklinhouse.com> - 3.01-1
 - Latest upstream
 * Mon Apr  7 2008 Steve Conklin <steve@conklinhouse.com> - 2.10.3-1

sources

@@ -1 +1 @@
-1dec4bedb919ddafeaf114bf14609bb8  fldigi-3.01.tar.gz
+912ddc303ca54b9e41e8c271c6160bbc  fldigi-3.11.6.tar.gz