rpms/kdetv/F-7 kdetv.spec,1.1,1.2

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/extras/rpms/kdetv/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29212

Modified Files:
	kdetv.spec 
Log Message:



Index: kdetv.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetv/F-7/kdetv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdetv.spec	9 Sep 2006 19:16:05 -0000	1.1
+++ kdetv.spec	13 Aug 2007 20:17:10 -0000	1.2
@@ -1,33 +1,31 @@
 Name:           kdetv
 Version:        0.8.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        KDE application for watching TV
-
 Group:          Applications/Multimedia
-License:        GPL/LGPL
+# Licensing Notes:
+# Kdetv itself is GPLv2
+# The kdetv libraries appear to be LGPLv2
+# The kdetv handbook is GFDL
+License:        GPLv2 and LGPLv2 and GFDL
+# Upstream no longer appears to be active
 URL:            http://www.kdetv.org
 Source0:        http://dziegel.free.fr/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libICE-devel
-BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
+BuildRequires:  gettext
 BuildRequires:  kdelibs-devel
+BuildRequires:  libGL-devel
+BuildRequires:  libICE-devel
 BuildRequires:  libxml2
-BuildRequires:  doxygen
 BuildRequires:  libXvMC-devel
 BuildRequires:  libXxf86dga-devel
 BuildRequires:  libXxf86vm-devel
 BuildRequires:  lirc-devel
-BuildRequires:  libGL-devel
-BuildRequires:  gettext
+BuildRequires:  zlib-devel
 BuildRequires:  zvbi-devel
-BuildRequires:  desktop-file-utils
-
-# Additional BRs implied by others:
-# kdelibs-devel => arts-devel, libjpeg-devel, kdelibs, qt-devel
-# qt-devel => libpng-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
-# arts-devel => alsa-lib-devel
-# libXvMC-devel => libXv-devel
-# libXext-devel => xorg-x11-proto-devel
+Requires:       hicolor-icon-theme
 
 %description
 kdetv is a KDE application that allows you to watch television on your
@@ -37,6 +35,9 @@
 
 %prep
 %setup -q
+# Fix .desktop categories
+sed -i 's|Categories=QT;KDE;Multimedia;AudioVideo;Video;TV;|Categories=KDE;AudioVideo;TV;|' \
+    %{name}/clients/%{name}/%{name}.desktop
 
 
 %build
@@ -50,8 +51,7 @@
 %find_lang %{name}
 
 #Install .desktop file to better location
-desktop-file-install --delete-original --vendor="" \
-                     --add-category X-Fedora \
+desktop-file-install --delete-original --vendor fedora \
                      --dir %{buildroot}%{_datadir}/applications \
                      %{buildroot}%{_datadir}/applnk/Multimedia/%{name}.desktop
 
@@ -97,20 +97,24 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/services/%{name}
 %{_datadir}/servicetypes/%{name}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %doc AUTHORS ChangeLog COPYING COPYING.LIB README TODO VERSION
 
 
 %changelog
-* Sat Sep 09 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-4%{?dist}
+* Sun Aug 12 2007 Ian Chapman <packages at amiga-hardware.com> 0.8.9-5
+- Updated license field due to new guidelines
+- Fixed .desktop categories
+
+* Sat Sep 09 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-4
 - Dropped libXext buildrequire as it's pulled in by qt-devel
 
-* Fri Sep 01 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-3%{?dist}
+* Fri Sep 01 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-3
 - Minor spec file cleanup
 - Drop vendor tag from .desktop as it's not created by fedora
 
-* Wed Aug 30 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-2%{?dist}
+* Wed Aug 30 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-2
 - Added zvbi support
 
-* Sun Aug 27 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-1%{?dist}
+* Sun Aug 27 2006 Ian Chapman <packages at amiga-hardware.com> 0.8.9-1
 - Initial release
\ No newline at end of file