From e4cbd41dba9c9ea09640ab96e9caf8fdb573131124fcb9d51f7154a766c87587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 14 Aug 2019 08:32:07 +0000 Subject: [PATCH] - Switch up to pkgconfgi style dependencies OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=47 --- libdc1394-rpmlintrc | 5 ----- libdc1394.changes | 5 +++++ libdc1394.spec | 47 ++++++++++++++------------------------------- 3 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 libdc1394-rpmlintrc diff --git a/libdc1394-rpmlintrc b/libdc1394-rpmlintrc deleted file mode 100644 index 874b4af..0000000 --- a/libdc1394-rpmlintrc +++ /dev/null @@ -1,5 +0,0 @@ -# This line is mandatory to access the configuration functions -from Config import * - -addFilter("libdc1394.* package-with-huge-docs.*") -addFilter("libdc1394.* shlib-policy-missing-lib.*") diff --git a/libdc1394.changes b/libdc1394.changes index 6209477..8f714c3 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 14 08:31:11 UTC 2019 - Tomáš Chvátal + +- Switch up to pkgconfgi style dependencies + ------------------------------------------------------------------- Sat Jul 6 13:34:52 UTC 2019 - Matwey V. Kornilov diff --git a/libdc1394.spec b/libdc1394.spec index fc8d8e3..b807925 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -22,31 +22,20 @@ Release: 0 Summary: 1394-Based Digital Camera Control Library License: LGPL-2.1-or-later Group: Hardware/Camera -Url: http://damien.douxchamps.net/ieee1394/libdc1394/ +URL: https://damien.douxchamps.net/ieee1394/libdc1394/ Source0: https://downloads.sourceforge.net/project/libdc1394/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 -%if 0%{?suse_version} > 1100 -# no IIDC-over-USB support for openSUSE 11.0 -BuildRequires: libusb-1_0-devel -BuildRequires: pkg-config -%endif -%if 0%{?suse_version} >= 1210 -BuildRequires: libv4l-devel >= 0.8.4 -%endif +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libraw1394) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libv4l2) >= 0.8.4 +BuildRequires: pkgconfig(sdl) %description This library provides functionality for controlling any camera that @@ -70,7 +59,7 @@ Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ Requires: %{name}-tools = %{version} Requires: libdc1394-25 = %{version} -Requires: libraw1394-devel +Requires: pkgconfig(libraw1394) %description devel This package contains the header files and libraries for building @@ -80,23 +69,18 @@ programs using the dc1394 library. Summary: Command-line utilities from libdc1394 # added on 2015-11-14 Group: Hardware/Camera -Obsoletes: %name < %version-%release -Provides: %name = %version-%release +Obsoletes: %{name} < %{version}-%{release} +Provides: %{name} = %{version}-%{release} %description tools This subpackage contains a 1394 bus reset utility. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%if 0%{?suse_version} >= 1210 -%patch3 -p1 -%endif +%autopatch -p1 %build -autoreconf --force --install +autoreconf -fvi %configure \ --disable-static \ --disable-xv @@ -110,21 +94,18 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* find %{buildroot} -type f -name "*.la" -delete -print %post 25 -p /sbin/ldconfig - %postun 25 -p /sbin/ldconfig %files tools -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/dc1394_reset_bus -%{_mandir}/man1/dc1394_reset_bus.1* +%{_mandir}/man1/dc1394_reset_bus.1%{?ext_man} %files 25 -%defattr(-,root,root) %{_libdir}/libdc1394.so.25* %files devel -%defattr(-,root,root) %{_includedir}/dc1394 %{_libdir}/libdc1394.so %{_libdir}/pkgconfig/*.pc