From 7991f9660c7cb35ada44b193b242a4a94be12f4bdd3fb4d25cff8f388db925b1 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sun, 15 Nov 2015 08:07:07 +0000 Subject: [PATCH] Accepting request 344426 from home:jengelh:branches:multimedia:libs - Use new homepage URL, URL for source archive location, and do gpgkey verification. Set RPM groups to more appropriate values. - Heed shared library packaging guideline, spell out license differences. - Remove unused --with-pic; we build no static libs, and the shared library always gets it implicitly anyway. - Name the utility package -tools as with many other pkgs. OBS-URL: https://build.opensuse.org/request/show/344426 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libiec61883?expand=0&rev=10 --- baselibs.conf | 2 +- libiec61883-1.2.0.tar.bz2 | 3 -- libiec61883-1.2.0.tar.sign | 17 +++++++ libiec61883-1.2.0.tar.xz | 3 ++ libiec61883.changes | 11 +++++ libiec61883.keyring | 56 +++++++++++++++++++++++ libiec61883.spec | 93 ++++++++++++++++++++++++-------------- 7 files changed, 148 insertions(+), 37 deletions(-) delete mode 100644 libiec61883-1.2.0.tar.bz2 create mode 100644 libiec61883-1.2.0.tar.sign create mode 100644 libiec61883-1.2.0.tar.xz create mode 100644 libiec61883.keyring diff --git a/baselibs.conf b/baselibs.conf index 7e90ee6..3da0564 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libiec61883 +libiec61883-0 diff --git a/libiec61883-1.2.0.tar.bz2 b/libiec61883-1.2.0.tar.bz2 deleted file mode 100644 index 6617b6c..0000000 --- a/libiec61883-1.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfcf6959ae5b9d15c887ebd052f737a5cb66168a8143405c822f858bc35f06c5 -size 296960 diff --git a/libiec61883-1.2.0.tar.sign b/libiec61883-1.2.0.tar.sign new file mode 100644 index 0000000..3c9b087 --- /dev/null +++ b/libiec61883-1.2.0.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAABAgAGBQJPAEYAAAoJEHnzb7JUXXnQStkQALZ4274TvRbMfMFudBm/Vk9/ +TDENcx1DCVjzj4pnIlpFddc8leYRfl9Xjdl4MI0y32DLjiKeaaxbpEO+p6w7yFKL +hMoUzsR3G7lP7p5B0tDW7Ewhflb9sg5hmxCtDmV+mC2Yi2t++DHNpzHe9e7+UyTf +fdRYozQjIqiEVafpHjzueGKQ4y6KKf0OY76S67uHJnC+A5ibs+Opc8WSHg/Xkdzs +4ZT/WV110K4K/6tjV2dWZcSgZe8vVh58Up5mrbyqPnHiUUIaWJ2EgbNvIvxCGSdI +30oUDL0p0pMPWT1p4R+elbshI9P0YQZf6kRy74Eu1Mbg/IY/KOfWHtH0TeFEWsYw +5HjuiFHr3LuJzXNPhvvfni7eu7j37T36P10JDOqnYAk4ISk+FUlzT+Si9yxJ7tKq +RjtiRiP8LfHao2OVV4w146PYUrRE3IMHBLVR6VmppIeROA9gDMXb56ZlvHWGAxO3 +b72RGft65V3zAf0SxVs5Vf+q/sUKBdTy/RgWjjSfYor4O+OBUFJxKJMLLi0Uc9KY +aPcT7i7T7GFQV8OYsmdiDi1QfV/ZppEOJA+OzdSRWVTqRdD82EY83rSfddBwV4Et +kCG2YO9j0Km6hQJjC4c+SsRJOCpFMKwKJj2xoSRw9y9TSB7MQiax2eM8epL3/D5g +iJwYsXZ8AE2FlYuPsmh/ +=xvJ/ +-----END PGP SIGNATURE----- diff --git a/libiec61883-1.2.0.tar.xz b/libiec61883-1.2.0.tar.xz new file mode 100644 index 0000000..8879c6c --- /dev/null +++ b/libiec61883-1.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1e02c7e276fac37313a2f8c1c33d7a9e19282ff16f32e72435428ff5121f09e +size 233640 diff --git a/libiec61883.changes b/libiec61883.changes index df2c610..3186ed5 100644 --- a/libiec61883.changes +++ b/libiec61883.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Nov 14 14:49:25 UTC 2015 - jengelh@inai.de + +- Use new homepage URL, URL for source archive location, and do + gpgkey verification. Set RPM groups to more appropriate values. +- Heed shared library packaging guideline, spell out license + differences. +- Remove unused --with-pic; we build no static libs, and the + shared library always gets it implicitly anyway. +- Name the utility package -tools as with many other pkgs. + ------------------------------------------------------------------- Wed Jan 2 11:17:33 UTC 2013 - p.drouand@gmail.com diff --git a/libiec61883.keyring b/libiec61883.keyring new file mode 100644 index 0000000..f8fe0b4 --- /dev/null +++ b/libiec61883.keyring @@ -0,0 +1,56 @@ +pub 4096R/0x79F36FB2545D79D0 2011-10-21 + Key fingerprint = 955C 0098 E5C4 6EF9 A152 4814 79F3 6FB2 545D 79D0 +uid [ unknown] Stefan Richter +sub 4096R/0x8243C1F5D30851B0 2011-10-21 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +8fwWIvw2x3j0 +=iBf9 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libiec61883.spec b/libiec61883.spec index bda8a10..81a1b8f 100644 --- a/libiec61883.spec +++ b/libiec61883.spec @@ -1,7 +1,7 @@ # # spec file for package libiec61883 # -# Copyright (c) 2012 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 @@ -15,19 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libiec61883 -BuildRequires: libraw1394-devel libtool pkgconfig Version: 1.2.0 Release: 0 -License: GPL-2.0+ Summary: Implementation of IEC 61883 -Url: http://www.linux1394.org/ -Group: System/Kernel +License: GPL-2.0+ and LGPL-2.1+ +Group: Hardware/Other +Url: https://ieee1394.wiki.kernel.org/index.php/Main_Page + +#Git-Web: https://git.kernel.org/cgit/libs/ieee1394/libiec61883.git +#Git-Clone: git://git.kernel.org/pub/scm/libs/ieee1394/libiec61883 +Source: https://www.kernel.org/pub/linux/libs/ieee1394/%name-%version.tar.xz +Source2: https://www.kernel.org/pub/linux/libs/ieee1394/%name-%version.tar.sign +Source3: %name.keyring +Source4: baselibs.conf +BuildRequires: libraw1394-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.bz2 -Source1: baselibs.conf %description This library is an implementation of IEC 61883, part 1 (CIP, plug @@ -35,6 +42,17 @@ registers, and CMP), part 2 (DV-SD), part 4 (MPEG2-TS), and part 6 (AMDTP). Outside of IIDC, nearly all FireWire multimedia devices use IEC 61883 protocols. +%package -n libiec61883-0 +Summary: Library implementing IEC 61883 +License: LGPL-2.1+ +Group: System/Libraries + +%description -n libiec61883-0 +This library is an implementation of IEC 61883, part 1 (CIP, plug +registers, and CMP), part 2 (DV-SD), part 4 (MPEG2-TS), and part 6 +(AMDTP). Outside of IIDC, nearly all FireWire multimedia devices use +IEC 61883 protocols. + The libiec61883 library provides a higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394. This includes both reception and transmission. It uses the new "rawiso" API of libraw1394, which @@ -46,11 +64,14 @@ for plug control registers and connection management that previously existed in experimental form in an unreleased version of libavc1394. %package devel -License: GPL-2.0+ -Summary: Implementation of IEC 61883 -Group: System/Kernel -Requires: %{name} = %{version} -Requires: libraw1394-devel +Summary: Development files for libiec61883 +License: LGPL-2.1+ +Group: Development/Libraries/C and C++ +Requires: libiec61883-0 = %version +%if 0%{?suse_version} && 0%{?suse_version} < 1140 +# already autoderived from libiec61883.pc in new-enough rpm +Requires: libraw1394-devel +%endif %description devel This library is an implementation of IEC 61883, part 1 (CIP, plug @@ -59,44 +80,50 @@ registers, and CMP), part 2 (DV-SD), part 4 (MPEG2-TS), and part 6 IEC 61883 protocols. The libiec61883 library provides a higher level API for streaming DV, -MPEG-2 and audio over Linux IEEE 1394. This includes both reception and -transmission. It uses the new "rawiso" API of libraw1394, which -transparently provides mmap-ed DMA for efficient data transfer. It also -represents the third generation of I/O technology for Linux 1394 for -these media types thereby removing the complexities of additional -kernel modules, /dev nodes, and procfs. It also consolidates features -for plug control registers and connection management that previously -existed in experimental form in an unreleased version of libavc1394. +MPEG-2 and audio over Linux IEEE 1394. + +%package tools +Summary: Command-line utilities for IEC 61883 devices +License: GPL-2.0+ and LGPL-2.1+ +Group: Hardware/Other +# added on 2015-11-14 +Obsoletes: %name < %version-%release +Provides: %name = %version-%release + +%description tools +Utilities to inspect and control IEC 61883 hardware. %prep %setup -q %build export CFLAGS="%optflags -fno-strict-aliasing" -%configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} all +%configure --disable-static +make %{?_smp_mflags} all %install -%{__make} install DESTDIR=%{buildroot} +%make_install libtool --mode=install install -m 755 examples/test-mpeg2 %{buildroot}%{_bindir} rm -f %{buildroot}%{_libdir}/*.la -%post -p /sbin/ldconfig +%post -n libiec61883-0 -p /sbin/ldconfig +%postun -n libiec61883-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files +%files tools %defattr(-,root,root) -%doc AUTHORS COPYING* NEWS README +%doc AUTHORS NEWS README %{_bindir}/* -%{_libdir}/lib*.so.* -%doc %{_mandir}/man[1]/*.gz +%doc %{_mandir}/man1/*%{?ext_man} + +%files -n libiec61883-0 +%defattr(-,root,root) +%doc COPYING* +%{_libdir}/libiec61883.so.* %files devel %defattr(-,root,root) %{_includedir}/libiec61883 -%defattr(644,root,root) %{_libdir}/lib*.so -%{_libdir}/pkgconfig/lib*.pc +%{_libdir}/pkgconfig/*.pc %changelog