rpms/streamtuner/F-9 streamtuner.spec,1.14,1.15

[Matthias Haase]

Author: endur

Update of /cvs/extras/rpms/streamtuner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26681

Modified Files:
	streamtuner.spec 
Log Message:
A change from htmlview to xdg-open and some minor fixes.


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/F-9/streamtuner.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- streamtuner.spec	17 Sep 2008 11:19:25 -0000	1.14
+++ streamtuner.spec	20 Oct 2008 12:29:35 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 22%{?dist}
+Release: 23%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -12,7 +12,7 @@
 Patch4: %{name}-%{version}-shoutcast.patch
 License: BSD
 Group: Applications/Internet
-Requires: python, pygtk2, htmlview, audacious, xterm
+Requires: python, pygtk2, xdg-utils, audacious, xterm
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
@@ -26,7 +26,7 @@
 %description 
 Streamtuner is a stream directory browser,
 it offers an intuitive GTK+ 2.0 interface
-to Internet radio directories such as SHOUTcast and Live365
+to Internet radio directories such as SHOUTcast and Live365.
 
 %package devel
 Summary: Development files for streamtuner
@@ -39,7 +39,7 @@
 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
+to develop applications for Streamtuner.
 
 %prep
 %setup -q
@@ -49,6 +49,10 @@
 %patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
 %patch4 -p1 -b .%{name}-%{version}-shoutcast.patch
 
+iconv -f latin1 -t utf8 < NEWS > NEWS.utf8
+touch -c -r NEWS NEWS.utf8
+mv NEWS.utf8 NEWS
+
 %build
 %configure
 %{__make} %{?_smp_mflags}
@@ -56,45 +60,39 @@
 %install
 %{__rm} -rf %{buildroot}
 
-%makeinstall
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+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} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
-%{__rm} -f %{buildroot}%{_libdir}/%{name}/plugins/*.*a
+%{__rm} %{buildroot}%{_libdir}/%{name}/plugins/*.*a
 
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-StartupNotify=true
-Name=Streamtuner
-Comment=A stream directory browser.
-Exec=%{name}
-Icon=%{name}.png
-Terminal=false
-Type=Application
-EOF
 mkdir -p %{buildroot}%{_datadir}/applications 
 desktop-file-install --vendor=fedora         \
+  --delete-original                          \
   --dir %{buildroot}%{_datadir}/applications \
-  --add-category X-Fedora                    \
-  --add-category Application                 \
-  --add-category AudioVideo                  \
-  %{name}.desktop
+  %{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
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
@@ -106,16 +104,19 @@
 %{_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/*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Oct 20 2008 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-23
+- 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-22
 - missed required release bump up