From d0327d2d90b1253ec210e8ad2660ea6cc0b8414b4cb4d2650583b4cfe3ee6b30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 15 Oct 2014 14:38:11 +0000 Subject: [PATCH] Drop libdwarf-devel OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=16 --- dwarves.changes | 6 ++++++ dwarves.spec | 40 +++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dwarves.changes b/dwarves.changes index 7406eba..3648971 100644 --- a/dwarves.changes +++ b/dwarves.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 15 14:37:48 UTC 2014 - jengelh@inai.de + +- Drop libdwarf dependency; it is not needed for build (libdw + is used instead) + ------------------------------------------------------------------- Wed Jun 6 21:39:25 UTC 2012 - jengelh@inai.de diff --git a/dwarves.spec b/dwarves.spec index f16aa17..31a3e8c 100644 --- a/dwarves.spec +++ b/dwarves.spec @@ -1,7 +1,7 @@ # # spec file for package dwarves # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,21 @@ Name: dwarves -Url: http://acmel.wordpress.com/ +Version: 1.10 +Release: 0 Summary: DWARF utilities License: GPL-2.0 Group: Development/Tools/Debuggers -Version: 1.10 -Release: 0 +Url: http://acmel.wordpress.com/ -#Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/acme/pahole +#Git-Clone: git://git.kernel.org/pub/scm/devel/pahole/pahole +#Git-Web: http://git.kernel.org/cgit/devel/pahole/pahole.git #DL-URL: http://fedorapeople.org/~acme/dwarves/ -Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.bz2 +Source: http://fedorapeople.org/~acme/dwarves/%name-%version.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: libdw-devel >= 0.142 -BuildRequires: libdwarf-devel BuildRequires: libebl-devel BuildRequires: libelf-devel BuildRequires: zlib-devel @@ -75,10 +75,9 @@ inserted in ELF binaries by compilers such as GCC, used by well known debuggers such as GDB, and more recent ones such as systemtap. %package -n libdwarves-devel - Summary: DWARF processing library development files -Group: Development/Libraries -Requires: libdwarves1 = %{version}-%{release} +Group: Development/Libraries/C and C++ +Requires: libdwarves1 = %version-%release %description -n libdwarves-devel This package contains the development files for libdwarves, a library @@ -88,31 +87,30 @@ for processing DWARF, a debugging data format for ELF files. %setup -q -c %build -export CFLAGS="$RPM_OPT_FLAGS" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -D__LIB=%{_lib} . +export CFLAGS="%optflags" +cmake -DCMAKE_INSTALL_PREFIX="%_prefix" -D__LIB="%_lib" . make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install - -%post -n libdwarves1 -p /sbin/ldconfig +make install DESTDIR="%buildroot" +%post -n libdwarves1 -p /sbin/ldconfig %postun -n libdwarves1 -p /sbin/ldconfig %files %defattr(-,root,root) %doc README NEWS -%{_bindir}/* -%{_mandir}/man*/* +%_bindir/* +%_mandir/man*/* %files -n libdwarves1 %defattr(-,root,root) -%{_libdir}/*.so.* +%_libdir/*.so.1* %files -n libdwarves-devel %defattr(-,root,root) -%{_libdir}/*.so -%{_includedir}/* -%{_datadir}/%{name} +%_libdir/*.so +%_includedir/* +%_datadir/%name %changelog