From c0d2b355e5060cf08ec2bc1f0ec1524e6139d5d155ed4d7f6297ae252bf59bd6 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 22 Mar 2015 06:43:19 +0000 Subject: [PATCH] Accepting request 292161 from home:pluskalm:branches:multimedia:libs - Cleanup spec file with spec-cleaner - Remove obsolete ppc provides/obsoletes OBS-URL: https://build.opensuse.org/request/show/292161 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libraw1394?expand=0&rev=17 --- libraw1394.changes | 6 ++++++ libraw1394.spec | 37 +++++++++++-------------------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libraw1394.changes b/libraw1394.changes index 053aa3a..a572941 100644 --- a/libraw1394.changes +++ b/libraw1394.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 21 07:56:45 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Remove obsolete ppc provides/obsoletes + ------------------------------------------------------------------- Thu Sep 4 18:51:55 UTC 2014 - crrodriguez@opensuse.org diff --git a/libraw1394.spec b/libraw1394.spec index 0ad5d92..601e76b 100644 --- a/libraw1394.spec +++ b/libraw1394.spec @@ -1,7 +1,7 @@ # # spec file for package libraw1394 # -# 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 @@ -23,19 +23,14 @@ Summary: A Firewire Interface License: LGPL-2.1+ Group: System/Kernel Url: http://www.dennedy.org/libraw1394/ -# bug437293 -%ifarch ppc64 -Obsoletes: libraw1394-64bit -%endif -# -BuildRequires: libtool -BuildRequires: openjade-devel -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.xz Source1: baselibs.conf Patch0: libraw1394.no-isodump.patch Patch1: libraw1394-exports.patch +BuildRequires: libtool +BuildRequires: openjade-devel +BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Linux kernel's IEEE 1394 subsystem provides access to the raw 1394 @@ -70,11 +65,6 @@ Pieter Palmers %package 11 Summary: A Firewire Interface Group: System/Kernel -# bug437293 -%ifarch ppc64 -Obsoletes: libraw1394-64bit -%endif -# %description 11 A library for the Linux IEEE-1394 subsystem, which provides direct @@ -86,11 +76,6 @@ Group: Development/Libraries/C and C++ Summary(pt_BR): Arquivos de desenvolvimento e cabeƧalhos para o libraw1394 Requires: %{name}-11 == %{version} Requires: glibc-devel -# bug437293 -%ifarch ppc64 -Obsoletes: libraw1394-devel-64bit -%endif -# %description devel Libraw1394 is the only supported interface to the kernel side raw1394 @@ -105,19 +90,19 @@ This archive contains the header files for libraw1394 development. %setup -q %patch0 -p1 %patch1 -p1 + %build autoreconf --force --install -%configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} all +%configure \ + --disable-static \ + --with-pic +make %{?_smp_mflags} all %install -%{__make} install DESTDIR=%{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} # empty dependency libs rm -f %{buildroot}%{_libdir}/libraw1394.la -%clean -rm -rf $RPM_BUILD_ROOT - %post 11 -p /sbin/ldconfig %postun 11 -p /sbin/ldconfig