diff -r 4f133201e207 -r 4667f24fe848 libavc1394/libavc1394.spec
--- a/libavc1394/libavc1394.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/libavc1394/libavc1394.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,15 +1,16 @@
+Name:           libavc1394
 Summary:        Audio/Video Control library for IEEE-1394 devices
-Name:           libavc1394
-Version:        0.5.3
-Release:        10%{?dist}
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
+Version:        0.5.4
+Release:        20101201
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://sourceforge.net/projects/libavc1394/
 Source:         http://downloads.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
-Patch1:         libavc1394-0.5.3-librom.patch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  libraw1394-devel
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-ExcludeArch:    s390 s390x
 
 %description
 The libavc1394 library allows utilities to control IEEE-1394 devices
@@ -17,17 +18,19 @@
 to control devices like the tape on a VCR or camcorder.
 
 %package devel
-Summary: Development libs for libavc1394
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libraw1394-devel, pkgconfig
+Summary:   Development libs for libavc1394
+Vendor:    Europalab Software
+Packager:  Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:     Development/Libraries
+Requires:  %{name} = %{version}-%{release}
+Requires:  libraw1394-devel, pkgconfig
 
 %description devel
 Development libraries required to build applications using libavc1394.
 
 %prep
 %setup -q
-%patch1 -p1 -b .librom
 chmod -x test/dvcont.c
 
 %build
@@ -38,9 +41,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
-# sigh, --disable-static doesn't work
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,29 +53,33 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog TODO
-# binaries are GPLv2+
 %{_bindir}/dvcont
 %{_bindir}/mkrfc2734
 %{_bindir}/panelctl
 %{_mandir}/man1/dvcont.1.gz
 %{_mandir}/man1/panelctl.1.gz
 %{_mandir}/man1/mkrfc2734.1*
-# libs are LGPLv2+
 %{_libdir}/libavc1394.so.*
 %{_libdir}/librom1394.so.*
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/libavc1394/
 %{_libdir}/pkgconfig/libavc1394.pc
+%{_libdir}/libavc1394.a
+%{_libdir}/libavc1394.la
 %{_libdir}/libavc1394.so
+%{_libdir}/librom1394.a
+%{_libdir}/librom1394.la
 %{_libdir}/librom1394.so
 
+%changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 0.5.4-20101201
+- Synchronize with upstream vendor version 0.5.4
+- Adjust packaging and patch logic
 
-%changelog
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 0.5.3-10
-- Build for MeeGo 1.1
+- Package for MeeGo 1.1
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild