rpms/tvtime/devel tvtime.spec, 1.37, 1.38 tvtime-0.9.13-pie.patch, 1.1, NONE

[Tomas Smetana]

Author: tsmetana

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

Modified Files:
	tvtime.spec 
Removed Files:
	tvtime-0.9.13-pie.patch 
Log Message:
* Sun May 31 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-6
- fix #498167 - patch by Philipp Hahn adding ALSA mixer support
- merge review changes



Index: tvtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- tvtime.spec	4 Mar 2009 08:37:05 -0000	1.37
+++ tvtime.spec	31 May 2009 13:07:12 -0000	1.38
@@ -1,16 +1,17 @@
 Summary: A high quality TV viewer
 Name: tvtime
 Version: 1.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
-Source: http://prdownloads.sourceforge.net/tvtime/%{name}-%{version}.tar.gz
-Patch0: tvtime-0.9.13-pie.patch
-Patch1: tvtime-1.0.1-gcc4.1.patch
-Patch2: tvtime-1.0.1-header.patch
-Patch3: tvtime-1.0.1-fsbadval.patch
-Patch4: tvtime-1.0.2-fonts.patch
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Upstream is dead since 2005...
+Patch0: tvtime-1.0.1-gcc4.1.patch
+Patch1: tvtime-1.0.1-header.patch
+Patch2: tvtime-1.0.1-fsbadval.patch
+Patch3: tvtime-1.0.2-fonts.patch
+Patch4: tvtime-1.0.2-alsamixer.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,29 +49,39 @@ videophiles.
 
 %prep
 %setup -q
-%patch1 -p1 -b .gcc
-%patch2 -p1 -b .header
-%patch3 -p1 -b .fsbadval
-%patch4 -p1 -b .fonts
+%patch0 -p1 -b .gcc
+%patch1 -p1 -b .header
+%patch2 -p1 -b .fsbadval
+%patch3 -p1 -b .fonts
+%patch4 -p1 -b .alsamixer
 
-for i in docs/man/de/*.?; do
+for i in AUTHORS docs/man/{de,es}/*.?; do
 	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
 	mv "${i}_" "$i"
 done
+# Remove .png extension from desktop file as it causes a warning
+# in desktop-file-install
+sed -i "s|tvtime.png|tvtime|g" docs/net-tvtime.desktop
+
+
 
 %build
+autoreconf
 %configure --disable-dependency-tracking --disable-rpath
 
-make CXXFLAGS="$RPM_OPT_FLAGS" \
-	CFLAGS="$RPM_OPT_FLAGS -DFONTDIR='\"/usr/share/fonts/liberation/\"'" \
+make CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} \
+	CFLAGS="$RPM_OPT_FLAGS -DFONTDIR='\"%{_datadir}/fonts/liberation/\"'" \
 	%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-%makeinstall
+make DESTDIR=%{buildroot} install
 # remove fonts
 rm -f %{buildroot}%{_datadir}/tvtime/*.ttf
+desktop-file-install --remove-category="Application" --add-category="Video" \
+	--delete-original --dir=%{buildroot}%{_datadir}/applications \
+	docs/net-tvtime.desktop
 
 %find_lang %{name}
 
@@ -89,12 +100,11 @@ fi
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %clean
-rm -rf %{buildroot}
+# rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING NEWS README* data/COPYING*
-%doc docs/html
+%defattr(-, root, root, -)
+%doc AUTHORS ChangeLog COPYING NEWS README* data/COPYING* docs/html
 %doc %{_mandir}/man?/*
 %config(noreplace) %{_sysconfdir}/tvtime/
 %{_bindir}/tvtime-command
@@ -106,10 +116,13 @@ rm -rf %{buildroot}
 %{_datadir}/tvtime/
 %lang(de) %{_mandir}/de/man?/*
 %lang(es) %{_mandir}/es/man?/*
-%defattr(775, root, root, 0755)
 %{_bindir}/tvtime
 
 %changelog
+* Sun May 31 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-6
+- fix #498167 - patch by Philipp Hahn adding ALSA mixer support
+- merge review changes
+
 * Tue Mar 03 2009 Tomas Smetana <tsmetana at redhat.com> 1.0.2-5
 - fix font requirements
 


--- tvtime-0.9.13-pie.patch DELETED ---