From 62357fcb63b5d0e71750fcb0394bd5f3181a60e2 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 4 May 2014 23:30:57 +0100
Subject: [PATCH] Fix FTBFS and cleanup spec

---
 libdv.spec | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/libdv.spec b/libdv.spec
index efd5022..1cf554a 100644
--- a/libdv.spec
+++ b/libdv.spec
@@ -1,7 +1,7 @@
 Summary:        Software decoder for DV format video
 Name:           libdv
 Version:        1.0.0
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://libdv.sourceforge.net/
@@ -9,15 +9,14 @@ Source:         http://downloads.sourceforge.net/libdv/libdv-%{version}.tar.gz
 Patch1:         libdv-0.104-no-exec-stack.patch
 Patch2:         libdv-1.0.0-pic.patch
 Patch3:         libdv-1.0.0-gtk2.patch
-Patch4:		libdv-1.0.0-dso-linking.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Patch4:         libdv-1.0.0-dso-linking.patch
+
 BuildRequires:  gtk2-devel
-BuildRequires:  libXt-devel, libXv-devel
-# Required for the gtk2 patch
-BuildRequires:  autoconf, automake, libtool, SDL-devel
-%if 0%{?fedora} >= 8
-BuildRequires: popt-devel
-%endif
+BuildRequires:  libXt-devel
+BuildRequires:  libXv-devel
+BuildRequires:  popt-devel
+BuildRequires:  SDL-devel
+BuildRequires:  autoconf, automake, libtool
 
 %description
 The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -29,7 +28,7 @@ and SMPTE 314M.
 %package tools
 Summary:        Basic tools to manipulate Digital Video streams
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description tools
 This package contains some basic programs to display and encode
@@ -41,7 +40,7 @@ digital camcorders, typically those that support the IEEE 1394
 %package devel
 Summary:        Development package for libdv
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
@@ -56,32 +55,26 @@ This package contains development files for libdv.
 # Required for libtool 2.2
 libtoolize
 # Required for the gtk2 patch
-autoreconf
+autoreconf -vif
 
 %build
 %configure --with-pic
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT%{_libdir}/libdv.a
 rm $RPM_BUILD_ROOT%{_libdir}/libdv.la
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING COPYRIGHT ChangeLog
 %{_libdir}/libdv.so.*
 
 %files tools
-%defattr(-,root,root,-)
 %doc README.*
 %{_bindir}/dubdv
 %{_bindir}/dvconnect
@@ -93,12 +86,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/playdv.1*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/libdv/
 %{_libdir}/libdv.so
 %{_libdir}/pkgconfig/libdv.pc
 
 %changelog
+* Sun May  4 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.0-17
+- Fix FTBFS and cleanup spec
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild