From 7fb1c8cd5171acfd4bf1365e85c1f9c68b250d2ce7d26d3051e42315515b3bea Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 22 Mar 2015 06:45:27 +0000 Subject: [PATCH] Accepting request 292153 from home:pluskalm:branches:multimedia:libs - Cleanup spec file with spec-cleaner - Use url for source - Remove obsolete ppc provides/obsoletes OBS-URL: https://build.opensuse.org/request/show/292153 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libavc1394?expand=0&rev=11 --- libavc-fix-symbolexports.patch | 4 + libavc1394-0.5.4.tar.bz2 | 3 - libavc1394-0.5.4.tar.gz | 3 + libavc1394.changes | 7 ++ libavc1394.no-mkrfc2734.patch | 6 +- libavc1394.raw1394_set_fcp_handler.patch | 6 +- libavc1394.spec | 120 +++++------------------ 7 files changed, 47 insertions(+), 102 deletions(-) delete mode 100644 libavc1394-0.5.4.tar.bz2 create mode 100644 libavc1394-0.5.4.tar.gz diff --git a/libavc-fix-symbolexports.patch b/libavc-fix-symbolexports.patch index 2660aa6..751608b 100644 --- a/libavc-fix-symbolexports.patch +++ b/libavc-fix-symbolexports.patch @@ -1,3 +1,5 @@ +Index: libavc1394-0.5.4/librom1394/Makefile.am +=================================================================== --- libavc1394-0.5.4.orig/librom1394/Makefile.am +++ libavc1394-0.5.4/librom1394/Makefile.am @@ -1,6 +1,6 @@ @@ -8,6 +10,8 @@ -version-info @lt_major@:@lt_revision@:@lt_age@ -lm librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo librom1394_la_SOURCES = \ +Index: libavc1394-0.5.4/libavc1394/Makefile.am +=================================================================== --- libavc1394-0.5.4.orig/libavc1394/Makefile.am +++ libavc1394-0.5.4/libavc1394/Makefile.am @@ -1,6 +1,6 @@ diff --git a/libavc1394-0.5.4.tar.bz2 b/libavc1394-0.5.4.tar.bz2 deleted file mode 100644 index 15fb2cb..0000000 --- a/libavc1394-0.5.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b3e79ecf13eefc9743138ba81ea75d40576f068d527e3f5c08ee4705615dc6f -size 262755 diff --git a/libavc1394-0.5.4.tar.gz b/libavc1394-0.5.4.tar.gz new file mode 100644 index 0000000..8821682 --- /dev/null +++ b/libavc1394-0.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53 +size 341679 diff --git a/libavc1394.changes b/libavc1394.changes index f62273b..d938b3b 100644 --- a/libavc1394.changes +++ b/libavc1394.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 21 07:35:05 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Use url for source +- Remove obsolete ppc provides/obsoletes + ------------------------------------------------------------------- Thu Sep 4 16:55:05 UTC 2014 - crrodriguez@opensuse.org diff --git a/libavc1394.no-mkrfc2734.patch b/libavc1394.no-mkrfc2734.patch index 4067c26..e838e9b 100644 --- a/libavc1394.no-mkrfc2734.patch +++ b/libavc1394.no-mkrfc2734.patch @@ -3,8 +3,10 @@ Tool is not needed for kernel 2.6 test/Makefile.am | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---- a/test/Makefile.am -+++ b/test/Makefile.am +Index: libavc1394-0.5.4/test/Makefile.am +=================================================================== +--- libavc1394-0.5.4.orig/test/Makefile.am ++++ libavc1394-0.5.4/test/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in -bin_PROGRAMS = dvcont mkrfc2734 panelctl diff --git a/libavc1394.raw1394_set_fcp_handler.patch b/libavc1394.raw1394_set_fcp_handler.patch index a2c866e..1148c6f 100644 --- a/libavc1394.raw1394_set_fcp_handler.patch +++ b/libavc1394.raw1394_set_fcp_handler.patch @@ -5,8 +5,10 @@ avc1394_simple.c:552: warning: ordered comparison of pointer with integer zero libavc1394/avc1394_simple.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---- a/libavc1394/avc1394_simple.c -+++ b/libavc1394/avc1394_simple.c +Index: libavc1394-0.5.4/libavc1394/avc1394_simple.c +=================================================================== +--- libavc1394-0.5.4.orig/libavc1394/avc1394_simple.c ++++ libavc1394-0.5.4/libavc1394/avc1394_simple.c @@ -549,8 +549,7 @@ avc1394_init_target( raw1394handle_t han if (cmd_handler == NULL) return -1; diff --git a/libavc1394.spec b/libavc1394.spec index 2845caf..3e4ba7d 100644 --- a/libavc1394.spec +++ b/libavc1394.spec @@ -1,7 +1,7 @@ # # spec file for package libavc1394 # -# Copyright (c) 2014 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 @@ -17,21 +17,23 @@ Name: libavc1394 -BuildRequires: libraw1394-devel -BuildRequires: libtool -BuildRequires: pkgconfig Version: 0.5.4 Release: 0 Summary: Libavc1394--Programming Interface to the AV/C Specification License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://sourceforge.net/projects/libavc1394/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: %{name}-%{version}.tar.bz2 +Source0: http://sourceforge.net/projects/libavc1394/files/libavc1394/%{name}-%{version}.tar.gz Source2: baselibs.conf -Patch: libavc1394.no-mkrfc2734.patch +Patch0: libavc1394.no-mkrfc2734.patch Patch1: libavc1394.raw1394_set_fcp_handler.patch Patch2: libavc-fix-symbolexports.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libraw1394-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libavc1394 is a programming interface to the AV/C specification from @@ -42,41 +44,10 @@ functions that can be controlled via AV/C. Eventually, the library will be expanded to implement more of the specification and to provide a high level interface to various devices. - - -Authors: --------- - Dan Dennedy - Andreas Micklei - Jason Howard - Man page by Daniel Kobras - -Libavc1394 is a programming interface to the AV/C specification from -the 1394 Trade Association. AV/C stands for Audio/Video Control. -Currently, applications use the library to control the tape transport -mechanism on DV camcorders. However, there are many devices and device -functions that can be controlled via AV/C. Eventually, the library will -be expanded to implement more of the specification and to provide a -high level interface to various devices. - - - -Authors: --------- - Dan Dennedy - Andreas Micklei - Jason Howard - Man page by Daniel Kobras - %package 0 Summary: Libavc1394--Programming Interface to the AV/C Specification License: LGPL-2.1+ Group: Development/Libraries/C and C++ -# bug437293 -%ifarch ppc64 -Obsoletes: libavc1394-64bit -%endif -# %description 0 Libavc1394 is a programming interface to the AV/C specification from @@ -87,40 +58,9 @@ functions that can be controlled via AV/C. Eventually, the library will be expanded to implement more of the specification and to provide a high level interface to various devices. - - -Authors: --------- - Dan Dennedy - Andreas Micklei - Jason Howard - Man page by Daniel Kobras - -Libavc1394 is a programming interface to the AV/C specification from -the 1394 Trade Association. AV/C stands for Audio/Video Control. -Currently, applications use the library to control the tape transport -mechanism on DV camcorders. However, there are many devices and device -functions that can be controlled via AV/C. Eventually, the library will -be expanded to implement more of the specification and to provide a -high level interface to various devices. - - - -Authors: --------- - Dan Dennedy - Andreas Micklei - Jason Howard - Man page by Daniel Kobras - %package devel -Summary: libavc1394 is a programming interface to the AV/C specification +Summary: Libavc1394 is a programming interface to the AV/C specification Group: Development/Libraries/C and C++ -# bug437293 -%ifarch ppc64 -Obsoletes: libavc1394-devel-64bit -%endif -# Requires: libavc1394-0 = %{version} Requires: libraw1394-devel @@ -133,32 +73,22 @@ functions of devices that can be controlled via AV/C. Eventually, the library will be expanded to implement more of the specification and to provide high level interfaces to various devices. - - -Authors: --------- - Dan Dennedy - Andreas Micklei - Jason Howard - Man page by Daniel Kobras - %prep -%setup -q -%patch -p1 +%setup -q +%patch0 -p1 %patch1 -p1 %patch2 -p1 %build autoreconf -ifv -%configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +%configure \ + --disable-static \ + --with-pic +make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -%{__rm} -f %{buildroot}%{_libdir}/*.la - -%clean -rm -rf $RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %post 0 -p /sbin/ldconfig @@ -167,18 +97,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README AUTHORS COPYING -%_mandir/man1/* -%attr(755,root,root)/usr/bin/* +%{_mandir}/man1/* +%attr(755,root,root)%{_bindir}/* %files 0 %defattr(-,root,root) -%_libdir/libavc1394.so.* -%_libdir/librom1394.so.* +%{_libdir}/libavc1394.so.* +%{_libdir}/librom1394.so.* %files devel %defattr(-,root,root) -%_libdir/*.so -%_includedir/libavc1394 -%_libdir/pkgconfig/*.pc +%{_libdir}/*.so +%{_includedir}/libavc1394 +%{_libdir}/pkgconfig/*.pc %changelog