[fmtools] fix ftbfs, cleanup spec

Peter Robinson pbrobinson at fedoraproject.org
Sat Jan 18 14:58:08 UTC 2014


commit 22ecf9db7a09c70b5f9da3dfdc09da19ebb87470
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jan 18 14:57:57 2014 +0000

    fix ftbfs, cleanup spec

 fmtools.spec |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/fmtools.spec b/fmtools.spec
index c40fedb..8ca9091 100644
--- a/fmtools.spec
+++ b/fmtools.spec
@@ -4,10 +4,11 @@
 Summary: Simple Video for Linux radio card programs
 Name:    fmtools
 Version: 2.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://benpfaff.org/fmtools
+
 Source0: http://benpfaff.org/fmtools/%{name}-%{version}.tar.gz
 Source1: fmcontrol.tar.gz
 Source2: http://benpfaff.org/fmtools/tkradio
@@ -18,7 +19,6 @@ Source8: radio.gif
 Source6: tkradio.py
 Source7: fmlircrc
 BuildRequires: autoconf automake
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 This is a pair of hopefully useful control programs for Video for Linux
@@ -58,13 +58,11 @@ or the volume given on the command line.
 %setup -q -a1
 
 %build
-aclocal
-autoconf
+autoreconf -vif
 %configure
-make %{_smp_mflags}
+make %{_smp_mflags} V=1
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/tkradio.tcl
 install -pm 0755 %{SOURCE3} %{buildroot}%{_bindir}/tkradio-mute.tcl
@@ -82,18 +80,13 @@ install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/radio.png
 install -Dpm 0644 %{SOURCE7} %{buildroot}%{_datadir}/%{name}/fmlircrc
 install -Dpm 0644 %{SOURCE8} %{buildroot}%{_datadir}/%{name}/radio.gif
 
-%clean
-rm -rf %{buildroot}
-
 %files 
-%defattr(-,root,root,-)
 %doc README COPYING
 %{_bindir}/fm
 %{_bindir}/fmscan
 %{_mandir}/man1/fm*.gz
 
 %files tkradio
-%defattr(-,root,root,-)
 %doc README.fmcontrol fmcontrol/dot.*
 %{_bindir}/tkradio*
 %{_bindir}/fmcontrol.py
@@ -103,6 +96,10 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/radio.gif
 
 %changelog
+* Sat Jan 18 2014 Peter Robinson <pbrobinson at fedoraproject.org> 2.0.7-2
+- Fix FTBFS
+- Cleanup spec
+
 * Mon Sep 30 2013 Paulo Roma <roma at lcg.ufrj.br> 2.0.7-1
 - Updated to 2.0.7
 


More information about the scm-commits mailing list