diff --git a/baselibs.conf b/baselibs.conf index ff7c244..d0ae73f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,7 +1,7 @@ libraw1394 -libraw1394-11 +libraw1394-8 obsoletes "libraw1394- <= " provides "libraw1394- = " libraw1394-devel requires -libraw1394- - requires "libraw1394-11- = " + requires "libraw1394-8- = " diff --git a/libraw1394-2.0.5.tar.bz2 b/libraw1394-2.0.5.tar.bz2 deleted file mode 100644 index 8f99559..0000000 --- a/libraw1394-2.0.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d108796775cac9e943d89754c3818c4b91089ff1d7156551d282601b13f5e3f -size 320413 diff --git a/libraw1394.changes b/libraw1394.changes index fa73d83..613388e 100644 --- a/libraw1394.changes +++ b/libraw1394.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 30 10:42:46 UTC 2010 - davejplater@gmail.com - -- Update to version 2.0.5 -- See https://ieee1394.wiki.kernel.org/index.php/Release_Notes_-_Libraries - for changes since 1.3.0 -- Upstream urls changed as http://www.linux1394.org/ is up for sale - and no longer in use. -- Removed patch libraw1394.eventloop-return.patch, already integrated. -- Removed mpg1394grab.patch and mpg1394grab-beautify.patch as the upstream - maintainer says that streaming video support is now integrated. - ------------------------------------------------------------------- Sat Apr 24 09:09:20 UTC 2010 - coolo@novell.com @@ -49,7 +37,7 @@ Tue Mar 18 20:58:03 CET 2008 - crrodriguez@suse.de - update to version 1.3.0 * added raw1394_read_cycle_timer() as used by FFADO project. * added support for environment variable RAW1394DEV to override default device node /dev/raw1394. - * added --with-valgrind to configure script. other optimizations and bugfixes - see ChangeLog. + * added --with-valgrind to configure script. other optimizations and bugfixes - see ChangeLog. ------------------------------------------------------------------- Sat Aug 4 17:22:06 CEST 2007 - olh@suse.de @@ -113,7 +101,7 @@ Sun Jan 12 21:55:44 CET 2003 - aj@suse.de ------------------------------------------------------------------- Thu Jun 20 00:39:42 CEST 2002 - ro@suse.de -- run autoreconf +- run autoreconf ------------------------------------------------------------------- Thu Jun 6 22:10:51 CEST 2002 - bk@suse.de diff --git a/libraw1394.spec b/libraw1394.spec index 01635ce..4ccda1a 100644 --- a/libraw1394.spec +++ b/libraw1394.spec @@ -1,5 +1,5 @@ # -# spec file for package libraw1394 (Version 2.0.5) +# spec file for package libraw1394 (Version 1.3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,54 +19,31 @@ Name: libraw1394 -Version: 2.0.5 -Release: 0 +Version: 1.3.0 +Release: 44 License: LGPLv2.1+ Summary: A Firewire Interface -Url: http://www.dennedy.org/libraw1394/ +Url: http://www.linux1394.org/ Group: System/Kernel # bug437293 %ifarch ppc64 Obsoletes: libraw1394-64bit %endif # -BuildRequires: pkg-config openjade-devel +BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.bz2 +Source0: http://www.linux1394.org/files/libraw1394/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch: libraw1394.no-isodump.patch +Patch1: libraw1394.eventloop-return.patch +Patch10: libraw1394.mpg1394grab.patch +Patch11: libraw1394.mpg1394grab-beautify.patch %description -The Linux kernel's IEEE 1394 subsystem provides access to the raw 1394 -bus through the raw1394 module. This includes the standard 1394 -transactions (read, write, lock) on the active side, isochronous -stream receiving and sending and dumps of data written to the -FCP_COMMAND and FCP_RESPONSE registers. raw1394 uses a character -device to communicate to user programs using a special protocol. +A library for the Linux IEEE-1394 subsystem, which provides direct +access to the connected 1394 (Firewire) bus. -libraw1394 was created with the intent to hide that protocol from -applications so that - -- the protocol has to be implemented correctly only once. - -- all work can be done using easy to understand functions instead of - handling a complicated command structure. - -- only libraw1394 has to be changed when raw1394's interface changes. - -Maintainer: Dan Dennedy - -Original author: Andreas Bombe - or - -Contributors: -Manfred Weihs -Christian Toegel -Dan Maas -Ben Collins -Pieter Palmers - -%package 11 +%package 8 License: LGPLv2.1+ Summary: A Firewire Interface Group: System/Kernel @@ -76,8 +53,7 @@ Obsoletes: libraw1394-64bit %endif # - -%description 11 +%description 8 A library for the Linux IEEE-1394 subsystem, which provides direct access to the connected 1394 (Firewire) bus. @@ -86,7 +62,7 @@ License: LGPLv2.1+ Summary: Development and Include Files for libraw1394 Summary(pt_BR): Arquivos de desenvolvimento e cabeçalhos para o libraw1394 Group: Development/Libraries/C and C++ -Requires: %{name}-11 == %{version} glibc-devel +Requires: %{name}-8 == %{version} glibc-devel # bug437293 %ifarch ppc64 Obsoletes: libraw1394-devel-64bit @@ -105,9 +81,12 @@ This archive contains the header files for libraw1394 development. %prep %setup -q %patch -p1 +%patch1 -p1 +%patch10 -p1 +%patch11 -p1 %build -#autoreconf --force --install +autoreconf --force --install export CFLAGS="%optflags" %configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} all @@ -120,9 +99,9 @@ rm -f %{buildroot}%{_libdir}/libraw1394.la %clean rm -rf $RPM_BUILD_ROOT -%post 11 -p /sbin/ldconfig +%post 8 -p /sbin/ldconfig -%postun 11 -p /sbin/ldconfig +%postun 8 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -130,11 +109,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/testlibraw %{_bindir}/dumpiso %{_bindir}/sendiso +%{_bindir}/mpg1394grab %{_mandir}/man*/* -%files 11 +%files 8 %defattr(-,root,root) -%{_libdir}/libraw1394.so.11* +%{_libdir}/libraw1394.so.8* %files devel %defattr(-,root,root)