diff -r 4f133201e207 -r 4667f24fe848 libdc1394/libdc1394.spec
--- a/libdc1394/libdc1394.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/libdc1394/libdc1394.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,28 +1,19 @@
-# $Id$
-
-#define svn_snapshot .svn459  
-#define real_version 2.0.0-rc8%{svn_snapshot}
-#%define real_version 2.1.0
-%define svn_build %{?svn_snapshot:1}%{!?svn_snapshot:0}
-
-Summary: 1394-based digital camera control library
-Name: libdc1394
-Version: 2.1.2
-Release: 3%{?svn_snapshot}%{?dist}
-License: LGPLv2+
-Group: System Environment/Libraries
-URL: http://sourceforge.net/projects/libdc1394/
-Source: http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-ExcludeArch: s390 s390x
-
-BuildRequires: kernel-headers
-BuildRequires: libraw1394-devel libusb1-devel
-BuildRequires: doxygen
-BuildRequires: libX11-devel libXv-devel
-%if %{svn_build}
-BuildRequires: libtool
-%endif
+Name:           libdc1394
+Summary:        1394-based digital camera control library
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
+Version:        2.1.2
+Release:        20101201
+License:        LGPLv2+
+Group:          System Environment/Libraries
+URL:            http://sourceforge.net/projects/libdc1394/
+Source:         http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  kernel-headers
+BuildRequires:  libraw1394-devel libusb1-devel
+BuildRequires:  libX11-devel libXv-devel
+BuildRequires:  doxygen
 
 %description
 Libdc1394 is a library that is intended to provide a high level programming
@@ -30,10 +21,13 @@
 cameras that conform to the 1394-based Digital Camera Specification.
 
 %package devel
-Summary: Header files and libraries for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, libraw1394-devel
-Requires: pkgconfig
+Summary:   Header files and libraries for %{name}
+Vendor:    Europalab Software
+Packager:  Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:     Development/Libraries
+Requires:  %{name} = %{version}-%{release}
+Requires:  pkgconfig, libraw1394-devel
 
 %description devel
 This package contains the header files and libraries
@@ -42,14 +36,20 @@
 
 %package docs
 Summary: Development documentation for %{name}
-Group: Documentation
+Vendor:  Europalab Software
+Packager: Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:   Documentation
 
 %description docs
 This package contains the development documentation for %{name}.
 
 %package tools
-Summary: Tools for use with %{name}
-Group: Applications/System
+Summary:   Tools for use with %{name}
+Vendor:    Europalab Software
+Packager:  Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:     Applications/System
 Requires: %{name} = %{version}
 
 %description tools
@@ -60,14 +60,7 @@
 %setup -q -n libdc1394-%{version}
 
 %build
-%if %{svn_build}
-cp /usr/share/libtool/ltmain.sh .
-aclocal
-autoheader
-autoconf
-automake --add-missing
-%endif
-%configure --disable-static --enable-doxygen-html --enable-doxygen-dot
+%configure --enable-doxygen-html --enable-doxygen-dot
 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}
@@ -75,15 +68,15 @@
 
 %install
 %{__rm} -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_docdir}/%{name}-docs-%{version}
 %{__install} -p -m 0644 doc/html/* %{buildroot}%{_docdir}/%{name}-docs-%{version}
 for p in grab_color_image grab_gray_image grab_partial_image ladybug grab_partial_pvn; do
-	%{__install} -p -m 0644 examples/$p %{buildroot}%{_bindir}/dc1394_$p
+    %{__install} -p -m 0644 examples/$p %{buildroot}%{_bindir}/dc1394_$p
 done
 %{__install} -p -m 0644 examples/dc1394_multiview %{buildroot}%{_bindir}/dc1394_multiview
 for f in grab_color_image grab_gray_image grab_partial_image; do
-	mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/dc1394_$f.1
+    mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/dc1394_$f.1
 done
 
 %post -p /sbin/ldconfig
@@ -102,9 +95,10 @@
 %defattr(-, root, root, 0755)
 %doc examples/*.h examples/*.c
 %{_includedir}/dc1394/
+%{_libdir}/libdc1394*.a
+%{_libdir}/libdc1394*.la
 %{_libdir}/libdc1394*.so
 %{_libdir}/pkgconfig/%{name}-2.pc
-%exclude %{_libdir}/*.la
 
 %files docs
 %defattr(-, root, root, 0755)
@@ -116,6 +110,9 @@
 %{_mandir}/man1/dc1394_*.1.gz
 
 %changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 2.1.2-20101201
+- Adjust packaging and patch logic
+
 * Fri Oct 29 2010 Kozinov Ivan <kozinov@gmail.com> - 2.1.2-3
 - Build for 1.1