[streamtuner] new sources and patches - switching to streamtuner2
Matthias Haase
endur at fedoraproject.org
Fri Nov 12 10:20:37 UTC 2010
commit 2c8c0abe01ddf0b59ed17bc3ed48f070f0938df1
Author: Matthias Haase <endur at bennew01.localdomain>
Date: Fri Nov 12 11:18:28 2010 +0100
new sources and patches - switching to streamtuner2
.gitignore | 1 +
sources | 2 +-
streamtuner-0.99.99-de-typo.patch | 13 -
streamtuner-0.99.99-defaultconfig.patch | 81 ------
streamtuner-0.99.99-desktop-file.patch | 12 -
streamtuner-0.99.99-live365.patch | 247 ----------------
streamtuner-0.99.99-pkgconfig.patch | 14 -
streamtuner-0.99.99-pygtk-2.6.patch | 18 --
streamtuner-0.99.99-shoutcast.patch | 50 ----
streamtuner-0.99.99-stack-increase.patch | 5 -
streamtuner.png | Bin 2654 -> 0 bytes
streamtuner.spec | 362 +++++++-----------------
streamtuner2-default-config-desktop-file.patch | 49 ++++
13 files changed, 153 insertions(+), 701 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70ceeec..0bcabec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
streamtuner-0.99.99.tar.gz
+/streamtuner2-2.0.8.src.tgz
diff --git a/sources b/sources
index fd5ac3c..280604d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2027b7c34e85b594524b0b4351c14362 streamtuner-0.99.99.tar.gz
+e2e1bc70f50ff52c34ff6ab6286819f0 streamtuner2-2.0.8.src.tgz
diff --git a/streamtuner.spec b/streamtuner.spec
index 8ab3518..4c66e6f 100644
--- a/streamtuner.spec
+++ b/streamtuner.spec
@@ -1,276 +1,118 @@
-Summary: A stream directory browser
-Name: streamtuner
-Version: 0.99.99
-Release: 32%{?dist}
-URL: http://streamtuner.sourceforge.net
-Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
-Source1: %{name}.png
-Patch0: %{name}-%{version}-live365.patch
-Patch1: %{name}-%{version}-pygtk-2.6.patch
-Patch2: %{name}-%{version}-defaultconfig.patch
-Patch3: %{name}-%{version}-pkgconfig.patch
-Patch4: %{name}-%{version}-shoutcast.patch
-Patch5: %{name}-%{version}-desktop-file.patch
-Patch6: %{name}-%{version}-stack-increase.patch
-Patch7: %{name}-%{version}-de-typo.patch
-License: BSD
-Group: Applications/Internet
-Requires: python, pygtk2, xdg-utils, audacious, xterm
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
-BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
-BuildRequires: desktop-file-utils
-Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
-Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-Streamtuner is a stream directory browser,
-it offers an intuitive GTK+ 2.0 interface
-to Internet radio directories such as SHOUTcast and Live365.
-
-%package devel
-Summary: Development files for streamtuner
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gtk2-devel, pkgconfig
-
-%description devel
-Streamtuner is a stream directory browser,
-it offers an intuitive GTK+ 2.0 interface
-to Internet radio directories such as SHOUTcast and Live365
-This package contains the libraries and includes files necessary
-to develop applications for Streamtuner.
+%define _name streamtuner2
+
+Name: streamtuner
+Version: 2.0.8
+Release: 3%{?dist}
+Summary: An internet radio browser
+Group: Applications/Multimedia
+License: Public Domain
+URL: http://milki.erphesfurt.de/streamtuner2/
+Source0: http://milki.erphesfurt.de/streamtuner2/streamtuner2-%{version}.src.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: python, pygtk2, pyxdg, audacious, xterm, python-lxml
+Requires: perl, gtk-doc
+BuildRequires: findutils, desktop-file-utils
+BuildRequires: python-devel
+BuildArch: noarch
+Obsoletes: streamtuner-devel
+
+# Patches
+Patch0: streamtuner2-default-config-desktop-file.patch
+
+%description
+Streamtuner lists radio directory services like Shoutcast, Xiph, Live365,
+MyOggRadio, Jamendo. It allows listening via any audio player and recording of
+streams via streamripper.
+This is streamtuner2 which mimics the older streamtuner 0.99.99 application
+in look and feel. But it's an independent rewrite and runs on Python;
+is therefore easier to extend.
%prep
-%setup -q
-%patch0 -p0 -b .%{name}-%{version}-live365
-%patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
-%patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
-%patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
-%patch4 -p1 -b .%{name}-%{version}-shoutcast.patch
-%patch5 -p1 -b .%{name}-%{version}-desktop-file.patch
-%patch6 -p0 -b .%{name}-%{version}-stack-increase.patch
-%patch7 -p1 -b .%{name}-%{version}-de-typo.patch
-
-iconv -f latin1 -t utf8 < NEWS > NEWS.utf8
-touch -c -r NEWS NEWS.utf8
-mv NEWS.utf8 NEWS
+%setup -qn %{_name}
+%patch0 -p1 -b .default-config-desktop-file
%build
-%configure --disable-live365
-%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-
-make install DESTDIR=%{buildroot} INSTALL='install -p'
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{__rm} -rf %{buildroot}%{_localstatedir}
-%{__rm} %{buildroot}%{_libdir}/%{name}/plugins/*.*a
-
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor=fedora \
- --delete-original \
+%{__install} -D -m 755 st2.py %{buildroot}/%{_bindir}/%{_name}
+%{__install} -D -m 644 %{_name}.desktop %{buildroot}/%{_datadir}/applications/%{_name}.desktop
+%{__install} -D -m 644 %{_name}.png %{buildroot}/%{_datadir}/pixmaps/%{_name}.png
+
+%{__mkdir} %{buildroot}/%{_datadir}/%{_name}
+files=`find . -maxdepth 1 -type f -name "*.py" -or -name "*.png" -or -name "*.glade"`
+for f in $files
+ do install -m 644 $f %{buildroot}/%{_datadir}/%{_name}/
+done
+
+# Permission correction
+%{__chmod} 0755 %{buildroot}/%{_datadir}/%{_name}/st2.py
+
+# Gnome help browser
+%{__mkdir} -p %{buildroot}%{_datadir}/doc/%{_name}/help
+%{__cp} -rp help %{buildroot}%{_datadir}/doc/%{_name}
+
+# Channels
+%{__mkdir} %{buildroot}/%{_datadir}/%{_name}/channels
+pushd channels
+files=`find . -maxdepth 1 -type f -name "*.py*" -or -name "*.png"`
+for f in $files
+ do install -m 644 $f %{buildroot}/%{_datadir}/%{_name}/channels/
+done
+popd
+
+# Fix encoding issues
+for file in README; do
+ sed 's|\r||' $file > $file.tmp
+ iconv -f ISO-8859-1 -t UTF8 $file.tmp > $file.tmp2
+ touch -r $file $file.tmp2
+ mv -f $file.tmp2 $file
+done
+
+sed -i -e 's/^Icon=%{_name}.png$/Icon=%{_name}/g' %{buildroot}%{_datadir}/applications/%{_name}.desktop
+sed -i -e 's/^Value=/Version=/g' %{buildroot}%{_datadir}/applications/%{_name}.desktop
+
+desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-%find_lang %{name}
-
-%post
-scrollkeeper-update -q || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-scrollkeeper-update -q || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+ --add-category Audio \
+ --add-category Tuner \
+ --add-category GTK \
+ --delete-original \
+ %{buildroot}%{_datadir}/applications/%{_name}.desktop
+
%clean
%{__rm} -rf %{buildroot}
-%files -f %{name}.lang
-%defattr(-, root, root, -)
-%doc AUTHORS COPYING NEWS README TODO
-%{_bindir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%{_libdir}/%{name}/plugins/*.so
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
-%dir %{_datadir}/omf/%{name}
-%{_datadir}/omf/%{name}/*
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/gtk-doc/html/*
-%dir %{_datadir}/help
-%{_datadir}/help/*
+%post
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-%files devel
-%defattr(-, root, root, -)
-%{_includedir}/*
-%{_libdir}/pkgconfig/*
+%postun
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%files
+%defattr(-,root,root,-)
+%doc README
+%{_bindir}/%{_name}
+%{_datadir}/applications/%{_name}.desktop
+%{_datadir}/pixmaps/%{_name}.png
+%dir %{_datadir}/%{_name}
+%{_datadir}/%{_name}/*.py*
+%{_datadir}/%{_name}/*.png
+%{_datadir}/%{_name}/*.glade
+%dir %{_datadir}/%{_name}/channels
+%{_datadir}/%{_name}/channels/*.py*
+%{_datadir}/%{_name}/channels/*.png
+%dir %{_datadir}/doc/%{_name}/help
+%{_datadir}/doc/%{_name}/help/*
%changelog
-* Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> - 0.99.99-32
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Wed Nov 25 2009 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-31
-- Patch added to increase stack size (bug #540120)
-- Patch added to fix de lang typo
-- Patch for desktop-file added - app name with leading capital letter now
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.99-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.99-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.99.99-26
-- Rebuild for Python 2.6
-
-* Mon Oct 20 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-25
-- Rebuild without live365
-
-* Mon Oct 20 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-24
-- A change from htmlview to xdg-open and some minor fixes - thanks to Patrice Dumas
-
-* Wed Sep 17 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-23
-- shoutcast-base-url patch added to shoutcast patch
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99.99-17
-- Autorebuild for GCC 4.3
-
-* Mon Feb 26 2007 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-16
-- bump up release
-
-* Thu Nov 23 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-15
-- bump up release
-
-* Thu Nov 23 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-14
-- FC6 uses audacious instead beep-media-player
-- defaultconfig.patch changed
-- dependency changed
-
-* Fri Sep 15 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-13
-- Rebuild for Fedora Extras 6
-
-* Sat Mar 4 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-12
-- Rebuild for Fedora Extras 5
-
-* Wed Jan 18 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-11
-- only a sync of the version number with the increased one from FC3
-
-* Sat Jan 7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
-- desktop-file-utils dependency removed from requires(post) and requires(postun)
-
-* Sat Jan 7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
-- desktop-file-utils dependency added again
-
-* Fri Jan 6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
-- desktop-file-utils dependency removed
-
-* Mon Jan 2 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-6
-- redundant dependencies removed
-- useless update-desktop-database call removed
-- pkgconfig.patch added
-
-* Thu Dec 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-5
-- defaultconfig patch for htmlview and beep-media-player
-- htmlview, bmp and xterm added to deps
-- more cleanups
-
-* Mon Dec 19 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-4
-- more cleanups
-- libxml2-devel and desktop-file-utils added to BuildRequires
-
-* Sun Dec 18 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-3
-- cleanups
-
-* Wed Jun 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-2.fc4
-- update-desktop-database added to post and postun
-
-* Thu Jun 16 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99-1
-- Update to 0.99.99
-- File list changed
-- Patches added
-- Rebuild for Fedora Core 4
-
-* Wed Nov 10 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Added libidn and libidn-devel
-- Rebuild for Fedora Core 3
-
-* Sat Oct 23 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.99
-- Many changes because the plugins have been now included in the core distribution
-- Taglib and taglib-devel added to deps
-
-* Wed Aug 11 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.12.5
-_ Category changed to AudioVideo for desktop link
-
-* Tue Aug 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.12.4
-- ChangeLog removed from the documentation
-
-* Thu Jun 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Rebuild for Fedora Core 2
-
-* Tue May 12 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.12.3
-
-* Fri Apr 02 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.12.1
-- scrollkeeper and some cleanups
-
-* Wed Feb 18 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.11.1
-
-* Sat Jan 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.10.2
-
-* Sun Nov 09 2003 Matthias Haase <matthias_haase at bennewitz.com>
-- Rebuild for Fedora Core 1
-
-* Mon Sep 29 2003 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.10.1
-- Some new translations
-
-* Wed Jul 16 2003 Matthias Haase <matthias_haase at bennewitz.com>
-- Update to 0.10.0
-- Theme directorys are removed and some cleanups are done
-
-* Sat Apr 05 2003 Matthias Haase <matthias_haase at bennewitz.com>
-- Rebuild of 0.9.1 for RH9
-
-* Tue Mar 18 2003 Matthias Haase <matthias_haase at bennewitz.com>
-- Rebuild for 0.9.1
-
-* Sun Feb 02 2003 Matthias Haase <matthias_haase at bennewitz.com>
-- Changes in order to match the GNU build system
-- Split into binary/devel packages
-- Rebuild for 0.9.0
-
-* Wed Dec 25 2002 Matthias Haase <matthias_haase at bennewitz.com>
-- Some cleanups in order to match RH8
-- smp flag added
-- RPM_OPT_FLAGS added
-- debugging disabled
-
-* Sat Oct 29 2002 Rudolf Kastl
-- Cosmetical changes.
+* Thu Nov 11 2010 endur <matthias_haase at bennewitz.com> - 2.0.8-3
+- enhanced default-config-desktop-file.patch
-* Sat Oct 05 2002 Rudolf Kastl
-- Minor fixes and new version.
+* Thu Nov 11 2010 Matthias Haase <matthias_haase at bennewitz.com> - 2.0.8-2
+- Many specfile enhancements and corrections
+- default-config-desktop-file.patch
+- Initial build for Fedora
-* Wed Aug 21 2002 Rudolf Kastl
-- Initial RPM release
+* Sat Nov 06 2010 Brendan Jones <brendan.jones.it at gmail.com> 2.0.8-1
+- initial build
diff --git a/streamtuner2-default-config-desktop-file.patch b/streamtuner2-default-config-desktop-file.patch
new file mode 100644
index 0000000..467f327
--- /dev/null
+++ b/streamtuner2-default-config-desktop-file.patch
@@ -0,0 +1,49 @@
+diff -Naur streamtuner2.orig/config.py streamtuner2.new/config.py
+--- streamtuner2.orig/config.py 2010-08-12 02:03:34.000000000 +0200
++++ streamtuner2.new/config.py 2010-11-11 20:53:55.180215988 +0100
+@@ -55,17 +55,17 @@
+
+ # some defaults
+ def defaults(self):
+- self.browser = "sensible-browser"
++ self.browser = "xdg-open "
+ self.play = {
+ "audio/mp3": "audacious ", # %u for url to .pls, %g for downloaded .m3u
+ "audio/ogg": "audacious ",
+- "audio/aac": "amarok -l ",
+- "audio/x-pn-realaudio": "vlc ",
++ "audio/aac": "audacious ",
++ "audio/x-pn-realaudio": "totem ",
+ "audio/*": "totem ",
+- "*/*": "vlc %srv",
++ "*/*": "totem %srv",
+ }
+ self.record = {
+- "*/*": "x-terminal-emulator -e streamripper %srv",
++ "*/*": "xterm -e streamripper %srv",
+ }
+ self.plugins = {
+ "bookmarks": 1, # built-in plugins, cannot be disabled
+diff -Naur streamtuner2.orig/streamtuner2.desktop streamtuner2.new/streamtuner2.desktop
+--- streamtuner2.orig/streamtuner2.desktop 2010-07-05 15:49:30.000000000 +0200
++++ streamtuner2.new/streamtuner2.desktop 2010-11-11 20:36:07.693117852 +0100
+@@ -2,13 +2,13 @@
+ Encoding=UTF-8
+ Value=1.0
+ Type=Application
+-
+ Exec=streamtuner2
+ Icon=streamtuner2.png
+-
+-Name=streamtuner2
+-Name[en]=streamtuner2
++Name=Streamtuner2
++Name[en]=Streamtuner2
+ GenericName=Internet radio browser
+ Comment=Listen to shoutcast/xiph/live365 music stations
++Categories=GNOME;GTK;AudioVideo;
++Terminal=false
++StartupNotify=true
+
+-Categories=AudioVideo
+\ Kein Zeilenumbruch am Dateiende.
More information about the scm-commits
mailing list