From 0d6901e116919af3c8a512e7d1b119a8e0b7262c Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Sat, 12 Nov 2005 05:07:57 +0000
Subject: [PATCH] - Update to 0.5.1. - Update librom patch to still apply
 cleanly.

---
 .cvsignore      |  1 -
 libavc1394.spec | 27 ++++++++++++++++-----------
 sources         |  1 -
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a560cbb..4e66a45 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-libavc1394-0.4.1.tar.gz
 libavc1394-0.5.1.tar.gz
diff --git a/libavc1394.spec b/libavc1394.spec
index b638f8a..ce67ded 100644
--- a/libavc1394.spec
+++ b/libavc1394.spec
@@ -1,15 +1,14 @@
 Summary: Audio/Video Control library for IEEE-1394 devices
 Name: libavc1394
-Version: 0.4.1
-Release: 9
+Version: 0.5.1
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://dl.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
+Patch: libavc1394-0.5.1-librom.patch
 BuildRequires: libraw1394-devel
 BuildRequires: autoconf automake libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Patch1: libavc1394-0.4.1-kill-configure-insanity.patch
-Patch2: libavc1394-librom.patch
 ExcludeArch: s390 s390x
 
 %description
@@ -28,8 +27,7 @@ Development libraries required to build applications using libavc1394.
 
 %prep
 %setup -q
-%patch1 -p0 -b .kill-configure-insanity
-%patch2 -p1
+%patch -p1 -b .librom
 
 %build
 # Rerun autotools to pick up newer libtool
@@ -39,7 +37,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,15 +49,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README ChangeLog
-%doc %{_mandir}/man1/dvcont.1.gz
 %{_bindir}/dvcont
-%{_libdir}/libavc1394.so.0*
-%{_libdir}/librom1394.so.0*
+%{_bindir}/mkrfc2734
+%{_libdir}/libavc1394.so.*
+%{_libdir}/librom1394.so.*
+%{_mandir}/man1/dvcont.1.gz
+%{_mandir}/man1/mkrfc2734.1*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/libavc1394
+%{_includedir}/libavc1394/
+%{_libdir}/pkgconfig/libavc1394.pc
 %{_libdir}/libavc1394.a
 %{_libdir}/libavc1394.la
 %{_libdir}/libavc1394.so
@@ -69,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 10 2005 Matthias Saou <http://freshrpms.net/> 0.5.1-1
+- Update to 0.5.1.
+- Update librom patch to still apply cleanly.
+
 * Sat Oct 15 2005 Florian La Roche <laroche@redhat.com>
 - make sure librom1394 is linked to libraw1394 and also
   libavc1394 is linked to librom1394 (also bz 156938)
diff --git a/sources b/sources
index 74cb21b..5014566 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-cca44f87bda7d5572473290dec7cd81e  libavc1394-0.4.1.tar.gz
 64a94a8814f3642a4051a40fd5fb59c5  libavc1394-0.5.1.tar.gz