From 7a2ff94feab6c27a8699dd7982b4433057c61285 Mon Sep 17 00:00:00 2001
From: paragn <paragn@fedoraproject.org>
Date: Thu, 21 Oct 2010 10:31:33 +0530
Subject: [PATCH] - Merge-review cleanup (#226030)

---
 libiec61883.spec | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/libiec61883.spec b/libiec61883.spec
index 034cb1c..3d46472 100644
--- a/libiec61883.spec
+++ b/libiec61883.spec
@@ -1,22 +1,21 @@
 Summary:        Streaming library for IEEE1394
 Name:           libiec61883
 Version:        1.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.gz
+# Fedora specific patches.
+
 Patch0:         libiec61883-1.2.0-installtests.patch
 Patch1:         libiec61883-channel-allocation-without-local-node-rw.patch
 URL:            http://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch:    s390 s390x
 
 # Works only with newer libraw1394 versions
-BuildRequires:  libraw1394-devel >= 1.2.1
-Requires:       libraw1394 >= 1.2.1
+BuildRequires:  libraw1394-devel
 
 %description
-
 The libiec61883 library provides an higher level API for streaming DV,
 MPEG-2 and audio over IEEE1394.  Based on the libraw1394 isochronous
 functionality, this library acts as a filter that accepts DV-frames,
@@ -27,7 +26,6 @@ down to isochronous packets, which are transmitted using libraw1394.
 Summary:        Development files for libiec61883
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig, libraw1394-devel >= 1.2.1
 
 %description devel
 Development files needed to build applications against libiec61883
@@ -46,18 +44,15 @@ Utilities that make use of iec61883
 %patch1 -p1
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-%configure
+%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/libiec61883.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libiec61883.la
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 
@@ -81,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> 1.2.0-5
+- Merge-review cleanup (#226030)
+
 * Fri Jan 8 2010 Jay Fenlason <fenlason@redhat.com> 1.2.0-4
 - Update the Source and URL fields to point to correct locations.