[xawtv] Spec file cleanup

Dmitry Butskoy buc at fedoraproject.org
Wed Feb 2 15:15:10 UTC 2011


commit 1a35c97310c14242cf556bea6b630876901a4bfa
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Wed Feb 2 18:14:46 2011 +0300

    Spec file cleanup

 xawtv.spec |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/xawtv.spec b/xawtv.spec
index 659e0a6..fd0b5f5 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,5 +1,3 @@
-%define libv4l	0%{!?_without_libv4l:1}
-
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.99.rc2
@@ -25,9 +23,9 @@ BuildRequires: libdv-devel
 BuildRequires: zvbi-devel, aalib-devel
 BuildRequires: gpm-devel, slang-devel
 BuildRequires: autoconf, desktop-file-utils
-%{!?_without_libv4l:BuildRequires: libv4l-devel}
+BuildRequires: libv4l-devel
 
-Requires: usermode xorg-x11-fonts-ISO8859-1-75dpi urw-fonts
+Requires: usermode xorg-x11-fonts-misc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,16 +52,11 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 %configure --disable-motif --disable-quicktime
 make verbose=yes
 
-for man in `find man -name "*.[1-9]" -print`
-do
-    iconv -f ISO8859-1 -t UTF-8 <$man >$man.new && mv -f $man.new $man
-done
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make STRIP_FLAG=-s DESTDIR=$RPM_BUILD_ROOT resdir=$RPM_BUILD_ROOT%{_datadir}/X11 SUID_ROOT="" install
+make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install
 
 #  we have no motif support
 rm -f $RPM_BUILD_ROOT%{_mandir}/*/motv.*


More information about the scm-commits mailing list