From c30e5374fe014241e8eb7fc14c9ca3535371c1bff2d44d6a7590e103eaf52a4d Mon Sep 17 00:00:00 2001
From: Matwey Kornilov <matwey.kornilov@gmail.com>
Date: Sun, 15 Nov 2015 14:39:40 +0000
Subject: [PATCH] Accepting request 344438 from
 home:jengelh:branches:multimedia:libs

- Drop redundant --with-pic; it is only used for static libs (which
  we do not build), and always on anyway for shared libraires.
- Name the utility package -tools as with many other pkgs.
- Remove non-library packages from baselibs.conf.

OBS-URL: https://build.opensuse.org/request/show/344438
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=37
---
 baselibs.conf     |  1 -
 libdc1394.changes |  8 ++++++++
 libdc1394.spec    | 26 +++++++++++++++++---------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index d9bc54a..8625e26 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1 @@
-libdc1394
 libdc1394-22
diff --git a/libdc1394.changes b/libdc1394.changes
index f456bb0..4b4c569 100644
--- a/libdc1394.changes
+++ b/libdc1394.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Nov 14 19:24:14 UTC 2015 - jengelh@inai.de
+
+- Drop redundant --with-pic; it is only used for static libs (which
+  we do not build), and always on anyway for shared libraires.
+- Name the utility package -tools as with many other pkgs.
+- Remove non-library packages from baselibs.conf.
+
 -------------------------------------------------------------------
 Sat Mar 21 07:49:15 UTC 2015 - mpluskal@suse.com
 
diff --git a/libdc1394.spec b/libdc1394.spec
index bc45dd9..4411422 100644
--- a/libdc1394.spec
+++ b/libdc1394.spec
@@ -22,8 +22,8 @@ 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
+Url:            http://damien.douxchamps.net/ieee1394/libdc1394/
+Source0:        http://downloads.sf.net/libdc1394/%{name}-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
 Source2:        baselibs.conf
 Patch0:         libdc1394.no-x11.patch
@@ -55,8 +55,8 @@ the low-level functionality provided by libraw1394 to communicate with
 the camera.
 
 %package 22
-Summary:        1394-Based Digital Camera Control Library
-Group:          Hardware/Camera
+Summary:        1394-based Digital Camera Control library
+Group:          System/Libraries
 
 %description 22
 This library provides functionality for controlling any camera that
@@ -68,7 +68,7 @@ communicate with the camera.
 %package devel
 Summary:        Development libraries and header files for dc1394
 Group:          Development/Libraries/C and C++
-Requires:       libdc1394 = %{version}
+Requires:       %{name}-tools = %{version}
 Requires:       libdc1394-22 = %{version}
 Requires:       libraw1394-devel
 
@@ -76,6 +76,16 @@ Requires:       libraw1394-devel
 This package contains the header files and libraries for building
 programs using the dc1394 library.
 
+%package tools
+Summary:        Command-line utilities from libdc1394
+Group:          Hardware/Camera
+# added on 2015-11-14
+Obsoletes:      %name < %version-%release
+Provides:       %name = %version-%release
+
+%description tools
+This subpackage contains a 1394 bus reset utility.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -87,15 +97,13 @@ programs using the dc1394 library.
 
 %build
 autoreconf --force --install
-export CFLAGS="%{optflags}"
 %configure \
 	--disable-static \
-	--with-pic \
 	--disable-xv
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_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*
@@ -105,7 +113,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %postun 22 -p /sbin/ldconfig
 
-%files
+%files tools
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/dc1394_reset_bus