From ffab98065a039ea3f234d1049cce3b67f0d62a52d9510f08a33d62b0ff7252bd Mon Sep 17 00:00:00 2001
From: Matwey Kornilov <matwey.kornilov@gmail.com>
Date: Sat, 21 Mar 2015 12:18:47 +0000
Subject: [PATCH] Accepting request 292156 from
 home:pluskalm:branches:multimedia:libs

- Cleanup spec file with spec-cleaner
- Use url for source

OBS-URL: https://build.opensuse.org/request/show/292156
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=35
---
 libdc1394-2.2.3.tar.bz2 |  3 ---
 libdc1394-2.2.3.tar.gz  |  3 +++
 libdc1394.changes       |  6 ++++++
 libdc1394.spec          | 45 ++++++++++++++++++++++-------------------
 4 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 libdc1394-2.2.3.tar.bz2
 create mode 100644 libdc1394-2.2.3.tar.gz

diff --git a/libdc1394-2.2.3.tar.bz2 b/libdc1394-2.2.3.tar.bz2
deleted file mode 100644
index 7eae503..0000000
--- a/libdc1394-2.2.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0823472fa3b5a3cfa64e1b39d7ad4e077e244cf10c122a273f3333fbac25b9e1
-size 462206
diff --git a/libdc1394-2.2.3.tar.gz b/libdc1394-2.2.3.tar.gz
new file mode 100644
index 0000000..31fe68d
--- /dev/null
+++ b/libdc1394-2.2.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a197880657f54519683ce014e613acdfd909767a69873eb23409fe423232bdd
+size 606042
diff --git a/libdc1394.changes b/libdc1394.changes
index 51c702a..f456bb0 100644
--- a/libdc1394.changes
+++ b/libdc1394.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Mar 21 07:49:15 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Use url for source
+
 -------------------------------------------------------------------
 Mon Nov 10 18:05:57 UTC 2014 - matwey.kornilov@gmail.com
 
diff --git a/libdc1394.spec b/libdc1394.spec
index cfa8f78..bc45dd9 100644
--- a/libdc1394.spec
+++ b/libdc1394.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdc1394
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,28 @@
 
 
 Name:           libdc1394
+Version:        2.2.3
+Release:        0
+Summary:        1394-Based Digital Camera Control Library
+License:        LGPL-2.1+
+Group:          Hardware/Camera
+Url:            http://sourceforge.net/projects/libdc1394/
+Source0:        http://sourceforge.net/projects/libdc1394/files/libdc1394-2/%{version}/%{name}-%{version}.tar.gz
+Source1:        %{name}-rpmlintrc
+Source2:        baselibs.conf
+Patch0:         libdc1394.no-x11.patch
+Patch1:         libdc1394.ac.patch
+Patch2:         libdc1394-swab_fix.patch
+Patch3:         libdc1394-v4l-2.6.38.patch
 BuildRequires:  autoconf
+BuildRequires:  libraw1394-devel
+BuildRequires:  libtool
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1110
 BuildRequires:  libSDL-devel
 %else
 BuildRequires:  SDL-devel
 %endif
-BuildRequires:  libraw1394-devel
-BuildRequires:  libtool
 %if 0%{?suse_version} > 1100
 # no IIDC-over-USB support for openSUSE 11.0
 BuildRequires:  libusb-1_0-devel
@@ -33,20 +47,6 @@ BuildRequires:  pkg-config
 %if 0%{?suse_version} >= 1210
 BuildRequires:  libv4l-devel >= 0.8.4
 %endif
-Version:        2.2.3
-Release:        0
-Summary:        1394-Based Digital Camera Control Library
-License:        LGPL-2.1+
-Group:          Hardware/Camera
-Url:            http://sourceforge.net/projects/libdc1394/
-Source0:        libdc1394-%{version}.tar.bz2
-Source1:        %{name}-rpmlintrc
-Source2:        baselibs.conf
-Patch0:         libdc1394.no-x11.patch
-Patch1:         libdc1394.ac.patch
-Patch2:         libdc1394-swab_fix.patch
-Patch3:         libdc1394-v4l-2.6.38.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This library provides functionality for controlling any camera that
@@ -61,7 +61,7 @@ Group:          Hardware/Camera
 %description 22
 This library provides functionality for controlling any camera that
 conforms to the 1394-Based Digital Camera Specification (which can be
-found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).  
+found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).
 It utilizes the low-level functionality provided by libraw1394 to
 communicate with the camera.
 
@@ -88,15 +88,18 @@ programs using the dc1394 library.
 %build
 autoreconf --force --install
 export CFLAGS="%{optflags}"
-%{configure} --disable-static --with-pic --disable-xv
+%configure \
+	--disable-static \
+	--with-pic \
+	--disable-xv
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1*
 rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1*
 rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1*
-rm -f %{buildroot}%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post 22 -p /sbin/ldconfig