rpms/tvtime/devel tvtime.spec,1.40,1.41

[Tomas Smetana]

Author: tsmetana

Update of /cvs/pkgs/rpms/tvtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6010

Modified Files:
	tvtime.spec 
Log Message:
* Mon Jun 01 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-8
- merge review round two; thanks to Jussi Lehtola



Index: tvtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- tvtime.spec	31 May 2009 15:53:38 -0000	1.40
+++ tvtime.spec	1 Jun 2009 08:11:06 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer
 Name: tvtime
 Version: 1.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -19,7 +19,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Requires: gtk2 >= 2.6
 Requires: font(liberationsans)
 Requires: font(liberationmono)
-Requires: desktop-file-utils
 Requires(post): hicolor-icon-theme
 Requires(postun): desktop-file-utils
 Requires(postun): hicolor-icon-theme
@@ -39,7 +38,7 @@ BuildRequires: libXv-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel
 BuildRequires: libtool
-BuildRequires: /usr/bin/desktop-file-install
+BuildRequires: desktop-file-utils
 
 ExcludeArch: s390 s390x
 
@@ -60,7 +59,8 @@ videophiles.
 %patch5 -p1 -b .localedef
 
 for i in AUTHORS docs/man/{de,es}/*.?; do
-	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
+	iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
+	touch -r "$i" "${i}_" && \
 	mv "${i}_" "$i"
 done
 # Remove .png extension from desktop file as it causes a warning
@@ -105,12 +105,12 @@ fi
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %clean
-# rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README* data/COPYING* docs/html
-%doc %{_mandir}/man?/*
+%{_mandir}/man?/*
 %config(noreplace) %{_sysconfdir}/tvtime/
 %{_bindir}/tvtime-command
 %{_bindir}/tvtime-configure
@@ -124,8 +124,11 @@ fi
 %{_bindir}/tvtime
 
 %changelog
+* Mon Jun 01 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-8
+- merge review round two; thanks to Jussi Lehtola
+
 * Sun May 31 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-7
-- fix conflictng type for locale_t
+- fix conflicting types for locale_t
 - fix build requires for rawhide
 
 * Sun May 31 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-6