More tweaks to get rid of the perl dependencies not available in EPEPL.

Bump release.
Tell configure not to include perl bindings.
2013-08-29 12:08:02 -05:00 · 2013-08-29 10:54:24 -05:00 · 2013-08-29 10:46:52 -05:00 · 2013-08-29 10:28:50 -05:00 · 2013-08-29 10:24:52 -05:00 · 2013-08-29 10:24:03 -05:00
3 changed files with 14 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,3 +16,4 @@ fldigi-3.20.20.tar.gz
 /fldigi-3.21.68.tar.gz
 /fldigi.pdf
 /fldigi-3.21.74.tar.gz
+/fldigi-3.21.72.tar.gz
--- a/fldigi.spec
+++ b/fldigi.spec
@ -1,6 +1,6 @@
 Name:		fldigi
-Version:	3.21.74
-Release:	1%{?dist}
+Version:	3.21.72
+Release:	3%{?dist}
 Summary:	Digital modem program for Linux
 Group:		Applications/Communications
 License:	GPLv3+	
@ -18,7 +18,9 @@ BuildRequires:	libsndfile-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	libsamplerate-devel
 BuildRequires:	pulseaudio-libs-devel
+%if 0%{?fedora}
 BuildRequires:	xmlrpc-c-devel
+%endif
 BuildRequires:	gettext
 BuildRequires:	libXinerama-devel

@ -58,7 +60,7 @@ chmod 644 ./src/olivia/olivia.cxx


 %build
-%configure
+%configure %{?rhel:--without-xmlrpc}
 make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread"


@ -85,23 +87,24 @@ install -pm 0644 %{SOURCE1} .
 %{_datadir}/pixmaps/flarq.xpm 
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man1/flarq.1.gz
-%{_mandir}/man1/%{name}-shell.1.gz
+%{?fedora:%{_mandir}/man1/%{name}-shell.1.gz}
 #attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}.desktop
 #%attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 %{_datadir}/applications/flarq.desktop
 %{_datadir}/%{name}/NAVTEX_Stations.csv
-%{_datadir}/%{name}/ToR-Stats-SHIP.csv
-%{_datadir}/%{name}/nsd_bbsss.txt
-%{_datadir}/%{name}/station_table.txt
+#{_datadir}/%{name}/ToR-Stats-SHIP.csv
+#{_datadir}/%{name}/nsd_bbsss.txt
+#{_datadir}/%{name}/station_table.txt

 %files doc
 %doc %{name}.pdf


 %changelog
-* Tue Aug 27 2013 Richard Shaw <hobbes1069@gmail.com> - 3.21.74-1
- Update to latest bugfix release.
+* Tue Aug 27 2013 Richard Shaw <hobbes1069@gmail.com> - 3.21.72-3
+- Build last version compatible with fltk 1.1.
+- Work around issue with mising perl dependencies in EPEL.

 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.21.68-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
--- a/2
+++ b/2
@ -1,2 +1,2 @@
-c19011fb63734954cd64f4fccfec3840  fldigi-3.21.74.tar.gz
 8ea330c53c30b4307f6881fa7fd73ebc  fldigi.pdf
+55494e1362099b5be5cec7d9972ef146  fldigi-3.21.72.tar.gz
Author	SHA1	Message	Date
Richard M. Shaw	089e7941ad	More tweaks to get rid of the perl dependencies not available in EPEPL.	2013-08-29 12:08:02 -05:00
Richard M. Shaw	bb19f4a65b	Bump release.	2013-08-29 10:54:24 -05:00
Richard M. Shaw	c19dcd5f01	Tell configure not to include perl bindings.	2013-08-29 10:46:52 -05:00
Richard M. Shaw	b15abb120e	Fix conditional	2013-08-29 10:28:50 -05:00
Richard M. Shaw	1e618b6f5f	Build last version compatible with fltk 1.1. - Work around issue with mising perl dependencies in EPEL.	2013-08-29 10:24:52 -05:00
Richard M. Shaw	ce94f9ae99	Work around missing perl dependencies in EPEL.	2013-08-29 10:24:03 -05:00
Richard M. Shaw	14087221c0	Remove files from %files that don't exist in this version.	2013-08-27 13:44:02 -05:00
Richard M. Shaw	b4b613c43a	Build last version compatible with fltk 1.1.	2013-08-27 13:29:20 -05:00