rpms/fmtools/F-12 .cvsignore, 1.3, 1.4 fmtools.desktop, 1.2, 1.3 fmtools.spec, 1.9, 1.10 import.log, 1.4, 1.5 sources, 1.3, 1.4 fmtools-videodev2.patch, 1.1, NONE
Paulo Roma Cavalcanti
roma at fedoraproject.org
Sun Dec 27 20:33:26 UTC 2009
Author: roma
Update of /cvs/pkgs/rpms/fmtools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12620/F-12
Modified Files:
.cvsignore fmtools.desktop fmtools.spec import.log sources
Removed Files:
fmtools-videodev2.patch
Log Message:
replaced fmcontrol for fmcontrol.py
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 21 Dec 2009 11:22:43 -0000 1.3
+++ .cvsignore 27 Dec 2009 20:33:26 -0000 1.4
@@ -1,2 +1,2 @@
-fmcontrol.tar.gz
fmtools-2.0.tar.gz
+fmcontrol.tar.gz
Index: fmtools.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fmtools.desktop 24 Dec 2009 10:26:36 -0000 1.2
+++ fmtools.desktop 27 Dec 2009 20:33:26 -0000 1.3
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=tkradio
-Comment=Tcl/Tk wrapper for fmtools
+Comment=Python/Tk wrapper for fmtools
Exec=tkradio.py
Icon=radio
Terminal=0
Index: fmtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/fmtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- fmtools.spec 25 Dec 2009 16:21:11 -0000 1.9
+++ fmtools.spec 27 Dec 2009 20:33:26 -0000 1.10
@@ -1,14 +1,12 @@
-%bcond_with rhel
Summary: Simple Video for Linux radio card programs
Name: fmtools
Version: 2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.stanford.edu/~blp/fmtools/
Source0: http://benpfaff.org/fmtools/fmtools/%{name}-%{version}.tar.gz
Patch0: fmtools.patch
-Patch1: fmtools-videodev2.patch
Source1: fmcontrol.tar.gz
Source2: http://www.stanford.edu/~blp/fmtools/tkradio
Source3: http://www.stanford.edu/~blp/fmtools/tkradio-mute
@@ -26,44 +24,31 @@ and create wrappers or new programs base
fm - a simple tuner
fmscan - a simple band scanner
-The script fmcontrol is something Adrian Lester put together one evening to
-save from himself having to remember frequencies and volumes when using the fm
-program from fmtools by Russell Kroll.
-
-The script does not support any of fm's command line options with the
-exception of volume.
-
-All that it does is to tune in to a station specified by name at the
-frequency and volume specified in $HOME/.fmrc and $HOME/.radiostations
-or the volume given on the command line.
-
%package tkradio
Summary: Python/Tk wrapper for fmtools
Group: Applications/Multimedia
BuildRequires: desktop-file-utils
Requires: %{name} = %{version}
Requires: python, tkinter, alsa-utils
-%{!?with_rhel:BuildArch: noarch}
+BuildArch: noarch
%description tkradio
This package provides a GUI for %{name}.
-The stations are read from the same files used by fmcontrol:
-$HOME/.fmrc or $HOME/.radiostations.
+The stations are read from the same files used by fmcontrol.
+
+The script fmcontrol.py saves one from remembering frequencies
+and volumes when using the "fm" program from %{name}.
+All that it does is to tune into a station specified by name, at the
+frequency and volume specified in $HOME/.fmrc or $HOME/.radiostations,
+or the volume given on the command line.
%prep
%setup -q -a1
%patch0 -p1 -b .fmtools
-%patch1 -p1 -b .videodev2
-
-# Add shebang to fmcontrol
-sed -i '1i#!/bin/sh' fmcontrol/fmcontrol
%build
%configure
-make %{_smp_mflags} \
-%if %{with rhel}
- CFLAGS="$RPM_OPT_FLAGS -D__RHEL5_VIDEODEV2__"
-%endif
+make %{_smp_mflags}
%install
rm -rf %{buildroot}
@@ -71,7 +56,7 @@ make DESTDIR=%{buildroot} install
install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/tkradio.tcl
install -pm 0755 %{SOURCE3} %{buildroot}%{_bindir}/tkradio-mute.tcl
install -pm 0755 %{SOURCE6} %{buildroot}%{_bindir}/tkradio.py
-install -pm 0755 fmcontrol/fmcontrol %{buildroot}%{_bindir}
+install -pm 0755 fmcontrol/fmcontrol %{buildroot}%{_bindir}/fmcontrol.py
install -pm 0644 fmcontrol/README README.fmcontrol
# menu entry
@@ -87,22 +72,23 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc README COPYING README.fmcontrol fmcontrol/dot.*
-# Executables and man pages
+%doc README COPYING
%{_bindir}/fm
%{_bindir}/fmscan
-%{_bindir}/fmcontrol
%files tkradio
%defattr(-,root,root,-)
+%doc README.fmcontrol fmcontrol/dot.*
%{_bindir}/tkradio*
+%{_bindir}/fmcontrol.py
%{_datadir}/applications/fmtools.desktop
%{_datadir}/pixmaps/radio.png
%changelog
-* Sun Dec 25 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-6
-- Patched videodev2 for RHEL5.
+* Sun Dec 27 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-7
+- Replaced fmcontrol for fmcontrol.py
+- Moved fmcontrol to tkradio package.
* Sun Dec 23 2009 Paulo Roma <roma at lcg.ufrj.br> 2.0-5
- Replaced BR tk for tkinter.
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 25 Dec 2009 16:21:11 -0000 1.4
+++ import.log 27 Dec 2009 20:33:26 -0000 1.5
@@ -2,3 +2,4 @@ fmtools-2_0-3_fc12:F-12:fmtools-2.0-3.fc
fmtools-2_0-4_fc12:F-12:fmtools-2.0-4.fc12.src.rpm:1261650364
fmtools-2_0-5_fc12:F-12:fmtools-2.0-5.fc12.src.rpm:1261655654
fmtools-2_0-6_fc12:F-12:fmtools-2.0-6.fc12.src.rpm:1261758030
+fmtools-2_0-7_fc12:F-12:fmtools-2.0-7.fc12.src.rpm:1261945933
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fmtools/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 21 Dec 2009 11:22:43 -0000 1.3
+++ sources 27 Dec 2009 20:33:26 -0000 1.4
@@ -1,2 +1,2 @@
-fe40296a7515f506c6b46a0ec7f056eb fmcontrol.tar.gz
807467a8bccae32317c6bdb6c5329ab3 fmtools-2.0.tar.gz
+8accad958c3f0cd0fb582aad922857aa fmcontrol.tar.gz
--- fmtools-videodev2.patch DELETED ---
More information about the fedora-extras-commits
mailing list