[packages/libdwarf] - updated to 20191104 - removed outdated makefile,link patches; automake is now used

[qboosh]

commit 4abf451e2142dd68d09eeb5430d508b7196cc588
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Dec 2 18:30:24 2019 +0100

    - updated to 20191104
    - removed outdated makefile,link patches; automake is now used

 libdwarf-makefile.patch | 35 --------------------------------
 libdwarf.spec           | 54 +++++++++++++++++++------------------------------
 2 files changed, 21 insertions(+), 68 deletions(-)
---
diff --git a/libdwarf.spec b/libdwarf.spec
index 1fc8cef..a493a91 100644
--- a/libdwarf.spec
+++ b/libdwarf.spec
@@ -1,18 +1,17 @@
 Summary:	Library to read DWARF debug information of an ELF object
 Summary(pl.UTF-8):	Biblioteka do odczytu informacji debugowych DWARF z obiektów ELF
 Name:		libdwarf
-Version:	20170709
+Version:	20191104
 Release:	1
 License:	LGPL v2.1 (library), GPL v2 (utilities)
 Group:		Libraries
 #Source0Download: https://www.prevanders.net/dwarf.html
 Source0:	https://www.prevanders.net/%{name}-%{version}.tar.gz
-# Source0-md5:	68a3c9aa7d01a433924a74bda588b378
-Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-link.patch
+# Source0-md5:	f5927304b32525f93bccefe2828e802d
 URL:		https://www.prevanders.net/dwarf.html
 BuildRequires:	elfutils-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,6 +25,8 @@ Summary:	Header files for libdwarf library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libdwarf
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	elfutils-devel
+Requires:	zlib-devel
 
 %description devel
 Header files for libdwarf library.
@@ -58,41 +59,26 @@ Tool for dumps DWARF debug information of an ELF object.
 Narzędzie wypisujące informacje debugowe DWARF z obiektów ELF.
 
 %prep
-%setup -q -n dwarf-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 %build
-die() { echo >&2 "$*"; exit 1; }
-cd libdwarf
 %configure \
-	--enable-shared
-# build races found
-%{__make} -j1 || die "make lib failed"
+	--enable-shared \
+	--disable-silent-rules
 
-cd ../dwarfdump
-%configure
-%{__make} || die "make dwarfdump failed"
-
-cd ../dwarfgen
-%configure
-%{__make} || die "make dwarfgen failed"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_includedir},%{_libdir},%{_mandir}/man1}
 
-install -p libdwarf/libdwarf.so.1 $RPM_BUILD_ROOT%{_libdir}/libdwarf.so.1.%{version}
-ln -s libdwarf.so.1.%{version} $RPM_BUILD_ROOT%{_libdir}/libdwarf.so.1
-ln -s libdwarf.so.1.%{version} $RPM_BUILD_ROOT%{_libdir}/libdwarf.so
-cp -p libdwarf/libdwarf.a $RPM_BUILD_ROOT%{_libdir}
-cp -p libdwarf/libdwarf.h $RPM_BUILD_ROOT%{_includedir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+# (another implementation) provided by elfutils
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/dwarf.h
 
-for d in dwarfdump; do
-	# dwarfgen is not really useful yet (just test/example program)
-	%{__make} -C $d install \
-		DESTDIR=$RPM_BUILD_ROOT
-done
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/libdwarf/libdwarf-devel
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,13 +88,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc libdwarf/CHANGES libdwarf/COPYING libdwarf/ChangeLog* libdwarf/NEWS libdwarf/README
+%doc libdwarf/{CHANGES,COPYING,ChangeLog*,NEWS,README}
 %attr(755,root,root) %{_libdir}/libdwarf.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdwarf.so.1
 
 %files devel
 %defattr(644,root,root,755)
+%doc libdwarf/libdwarf*.pdf
 %attr(755,root,root) %{_libdir}/libdwarf.so
+%{_libdir}/libdwarf.la
 %{_includedir}/libdwarf.h
 
 %files static
@@ -117,9 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n dwarfdump
 %defattr(644,root,root,755)
-%doc dwarfdump/COPYING dwarfdump/ChangeLog* dwarfdump/NEWS dwarfdump/README
-%{_sysconfdir}/dwarfdump.conf
+%doc dwarfdump/{COPYING,ChangeLog*,NEWS,README}
 %attr(755,root,root) %{_bindir}/dwarfdump
+%{_datadir}/dwarfdump
 %{_mandir}/man1/dwarfdump.1*
 
 %if 0
diff --git a/libdwarf-makefile.patch b/libdwarf-makefile.patch
deleted file mode 100644
index 884a732..0000000
--- a/libdwarf-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- dwarf-20161124/dwarfdump/Makefile.in.orig	2016-11-24 22:14:30.000000000 +0100
-+++ dwarf-20161124/dwarfdump/Makefile.in	2017-04-09 18:40:55.035853286 +0200
-@@ -11,7 +11,7 @@
- prefix =	@prefix@
- exec_prefix =	@exec_prefix@
- bindir =	$(exec_prefix)/bin
--libdir =	$(exec_prefix)/lib
-+sysconfdir =	@sysconfdir@
- mandir =        $(exec_prefix)/share/man
- man1dir =       $(mandir)/man1
- 
-@@ -36,8 +36,8 @@
- DIRINC =        $(srcdir)/../libdwarf
- LIBS =		@LIBS@ -L../libdwarf -ldwarf -lelf $(dwfzlib)
- INCLUDES =	-I. -I$(srcdir) -I../libdwarf -I$(srcdir)/../libdwarf
--CFLAGS =	$(PREINCS) @CPPFLAGS@ @CFLAGS@ $(INCLUDES) $(dwfwall) $(dwfsanitize) -DCONFPREFIX=${libdir} $(POSTINCS)
--LDFLAGS =	$(PRELIBS) @LDFLAGS@  $(LIBS) $(dwfsanitize) $(POSTLIBS)
-+CFLAGS =	$(PREINCS) @CPPFLAGS@ @CFLAGS@ $(INCLUDES) $(dwfwall) $(dwfsanitize) -DCONFPREFIX=${sysconfdir} $(POSTINCS)
-+LDFLAGS =	$(PRELIBS) @LDFLAGS@ -Wl,-rpath,../libdwarf $(LIBS) $(dwfsanitize) $(POSTLIBS)
- #VG =            valgrind --leak-check=full  --show-leak-kinds=all
- VG =
- 
-@@ -201,9 +201,9 @@
- # will work and leave sensible permissions on the resulting files.
- # Some adjustment might be required, see README.
- install: all
--	$(INSTALL) dwarfdump $(bindir)/dwarfdump
--	$(INSTALL) $(srcdir)/dwarfdump.conf $(libdir)/dwarfdump.conf
--	$(INSTALL) $(srcdir)/dwarfdump.1 $(man1dir)/dwarfdump.1
-+	$(INSTALL) dwarfdump $(DESTDIR)$(bindir)/dwarfdump
-+	$(INSTALL) $(srcdir)/dwarfdump.conf $(DESTDIR)$(sysconfdir)/dwarfdump.conf
-+	$(INSTALL) $(srcdir)/dwarfdump.1 $(DESTDIR)$(man1dir)/dwarfdump.1
- 
- uninstall:
- 	-rm -f $(bindir)/dwarfdump
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdwarf.git/commitdiff/4abf451e2142dd68d09eeb5430d508b7196cc588