From d421aff092433123390c413df38354dc27787ef2 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 31 Dec 2020 13:56:39 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libunicap.git#0141aca1b78ccabec3b8ff30466a162bd7efd9d4 --- .gitignore | 2 +- libunicap.spec | 70 ++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 32 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index c99ebec..0fae09e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libunicap-0.9.12.tar.gz +/libunicap-*.tar.gz diff --git a/libunicap.spec b/libunicap.spec index 4793ee4..b4001dc 100644 --- a/libunicap.spec +++ b/libunicap.spec @@ -4,33 +4,30 @@ %{expand:%%define prev__find_requires %{__find_requires}} %define __find_requires sh %{SOURCE1} %{prev__find_requires} -Summary: Library to access different kinds of (video) capture devices -Name: libunicap -Version: 0.9.12 -Release: 27%{?dist} -License: GPLv2+ -URL: http://www.unicap-imaging.org/ -Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz -Source1: %{name}-filter.sh -Patch0: libunicap-0.9.12-includes.patch -Patch1: libunicap-0.9.12-memerrs.patch -Patch2: libunicap-0.9.12-arraycmp.patch -Patch3: libunicap-0.9.12-warnings.patch -Patch4: libunicap-bz641623.patch -Patch5: libunicap-bz642118.patch -Patch6: libunicap-0.9.12-videodev.patch -Patch7: libunicap-0.9.12-datadirname.patch -Patch8: libunicap-0.9.12-gcc10.patch -BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4 -BuildRequires: glib2-devel >= 2.10.0 +Summary: Library to access different kinds of (video) capture devices +Name: libunicap +Version: 0.9.12 +Release: 27%{?dist} +License: GPLv2+ +URL: https://www.unicap-imaging.org/ +Source0: https://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +Source1: %{name}-filter.sh +Patch0: libunicap-0.9.12-includes.patch +Patch1: libunicap-0.9.12-memerrs.patch +Patch2: libunicap-0.9.12-arraycmp.patch +Patch3: libunicap-0.9.12-warnings.patch +Patch4: libunicap-bz641623.patch +Patch5: libunicap-bz642118.patch +Patch6: libunicap-0.9.12-videodev.patch +Patch7: libunicap-0.9.12-datadirname.patch +Patch8: libunicap-0.9.12-gcc10.patch +BuildRequires: gcc, make, systemd, glib2-devel >= 2.10.0 +BuildRequires: intltool, %{_bindir}/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4 %ifnarch s390 s390x -BuildRequires: libraw1394-devel >= 1.1.0 +BuildRequires: libraw1394-devel >= 1.1.0 %endif -BuildRequires: libv4l-devel >= 0.8.3-1, libtool, automake, autoconf -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 -BuildRequires: systemd -%endif -Obsoletes: unicap <= 0.9.7-1 +BuildRequires: libv4l-devel >= 0.8.3-1, libtool, automake, autoconf +Obsoletes: unicap <= 0.9.7-1 %description Unicap provides a uniform interface to video capture devices. It allows @@ -41,9 +38,9 @@ possible for devices supporting it allowing fast video capture with low CPU usage even on low-speed architectures. %package devel -Summary: Development files for the unicap library -Requires: %{name} = %{version}-%{release}, pkgconfig -Obsoletes: unicap-devel <= 0.9.7-1 +Summary: Development files for the unicap library +Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig +Obsoletes: unicap-devel <= 0.9.7-1 %description devel The libunicap-devel package includes header files and libraries necessary @@ -58,9 +55,7 @@ API documentation of the library, too. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%if 0%{?rhel}%{?fedora} >= 7 %patch6 -p1 -%endif %patch7 -p1 %patch8 -p1 @@ -86,30 +81,25 @@ sed -e 's/\(SYSFS\|ATTRS\)/ATTRS/g' -i $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules. touch -c -r {data,$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d}/50-euvccam.rules # Move udev rules file to appropriate rules directory -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}/ mv -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-euvccam.rules $RPM_BUILD_ROOT%{_udevrulesdir}/ -%endif %find_lang unicap %ldconfig_scriptlets %files -f unicap.lang -%doc AUTHORS ChangeLog COPYING README -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 +%license COPYING +%doc AUTHORS ChangeLog README %{_udevrulesdir}/50-euvccam.rules -%else -%config %{_sysconfdir}/udev/rules.d/50-euvccam.rules -%endif %{_libdir}/%{name}.so.* -%{_libdir}/unicap2 +%{_libdir}/unicap2/ %files devel %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_includedir}/unicap -%{_datadir}/gtk-doc/html/%{name} +%{_includedir}/unicap/ +%{_datadir}/gtk-doc/html/%{name}/ %changelog * Tue Jul 28 2020 Fedora Release Engineering - 0.9.12-27 diff --git a/sources b/sources index db3b813..b21fab2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -353657b4da519251d4cc6dee5a232391 libunicap-0.9.12.tar.gz +SHA512 (libunicap-0.9.12.tar.gz) = 9111ddf196b3a6087a6b94a6c5e4bd841e416e4d0079b6481f770f361963db95e1d463b62d58ef599242ab15e4a58ef840932ab5c73df735ef5821f873db14fb