rpms/tvtime/devel tvtime.spec,1.45,1.46

[Tomas Smetana]

Author: tsmetana

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

Modified Files:
	tvtime.spec 
Log Message:
* Mon Jan 04 2010 Tomas Smetana <tsmetana at redhat.com> 1.0.2-13
- merge review (#226508)
- revert the font-related patch; continue shipping tvtime's specific fonts



Index: tvtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- tvtime.spec	27 Jul 2009 06:24:04 -0000	1.45
+++ tvtime.spec	5 Jan 2010 16:47:13 -0000	1.46
@@ -10,19 +10,14 @@ Source0: http://downloads.sourceforge.ne
 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
-Patch5: tvtime-1.0.2-localedef.patch
-Patch6: tvtime-1.0.2-alsamixer2.patch
+Patch3: tvtime-1.0.2-alsamixer.patch
+Patch4: tvtime-1.0.2-localedef.patch
+Patch5: tvtime-1.0.2-alsamixer2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2 >= 2.6
-Requires: font(liberationsans)
-Requires: font(liberationmono)
-Requires(post): hicolor-icon-theme
-Requires(postun): desktop-file-utils
-Requires(postun): hicolor-icon-theme
+Requires: hicolor-icon-theme
 
 BuildRequires: freetype-devel >= 2.0
 BuildRequires: zlib-devel
@@ -56,10 +51,9 @@ videophiles.
 %patch0 -p1 -b .gcc
 %patch1 -p1 -b .header
 %patch2 -p1 -b .fsbadval
-%patch3 -p1 -b .fonts
-%patch4 -p1 -b .alsamixer
-%patch5 -p1 -b .localedef
-%patch6 -p1 -b .alsamixer2
+%patch3 -p1 -b .alsamixer
+%patch4 -p1 -b .localedef
+%patch5 -p1 -b .alsamixer2
 
 for i in AUTHORS docs/man/{de,es}/*.?; do
 	iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -77,16 +71,13 @@ libtoolize --force
 autoreconf
 %configure --disable-dependency-tracking --disable-rpath
 
-make CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} \
-	CFLAGS="$RPM_OPT_FLAGS -DFONTDIR='\"%{_datadir}/fonts/liberation/\"'" \
-	%{?_smp_mflags}
+make CXXFLAGS="%{optflags}" %{?_smp_mflags} \
+	CFLAGS="%{optflags}" %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} install
-# remove fonts
-rm -f %{buildroot}%{_datadir}/tvtime/*.ttf
+make DESTDIR=%{buildroot} INSTALL="/usr/bin/install -p" install
 desktop-file-install --remove-category="Application" --add-category="Video" \
 	--delete-original --dir=%{buildroot}%{_datadir}/applications \
 	docs/net-tvtime.desktop
@@ -112,9 +103,10 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING NEWS README* data/COPYING* docs/html
+%doc AUTHORS ChangeLog COPYING COPYING.LGPL NEWS README* data/COPYING* docs/html
 %{_mandir}/man?/*
-%config(noreplace) %{_sysconfdir}/tvtime/
+%dir %{_sysconfdir}/tvtime/
+%config(noreplace) %{_sysconfdir}/tvtime/tvtime.xml
 %{_bindir}/tvtime-command
 %{_bindir}/tvtime-configure
 %{_bindir}/tvtime-scanner
@@ -127,6 +119,10 @@ rm -rf %{buildroot}
 %{_bindir}/tvtime
 
 %changelog
+* Mon Jan 04 2010 Tomas Smetana <tsmetana at redhat.com> 1.0.2-13
+- merge review (#226508)
+- revert the font-related patch; continue shipping tvtime's specific fonts
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild