X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=elfutils.spec;h=d5e0ddee27c40994570c8c05aec41cee40bfc5a5;hb=d25f04e66cb7949f5372947340f90c111916d196;hp=596ccbb42093751e09fbfb22f93a5ec2691b24a4;hpb=54a69a2e0422b200d46b902dc08a9c1f9f7683bf;p=packages%2Felfutils.git

diff --git a/elfutils.spec b/elfutils.spec
index 596ccbb..d5e0dde 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -5,14 +5,12 @@
 Summary:	A collection of utilities and DSOs to handle compiled objects
 Summary(pl.UTF-8):	Zestaw narzędzi i bibliotek do obsługi skompilowanych obiektów
 Name:		elfutils
-Version:	0.128
-Release:	1
+Version:	0.141
+Release:	2
 License:	GPL v2 with OSL linking exception
 Group:		Development/Tools
-# http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/
-# or abuse systemtap to get .tar.gz directly
-Source0:	ftp://sources.redhat.com/pub/systemtap/elfutils/%{name}-%{version}.tar.gz
-# Source0-md5:	4da87e49616101ec256e313218c421ef
+Source0:	https://fedorahosted.org/releases/e/l/elfutils/%{name}-%{version}.tar.bz2
+# Source0-md5:	2d0fe5651c0de1fd28e7dd006effe7d1
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-debian-manpages.patch
 Patch2:		%{name}-portability.patch
@@ -20,21 +18,20 @@ Patch3:		%{name}-robustify.patch
 Patch4:		%{name}-align.patch
 Patch5:		%{name}-paxflags.patch
 Patch6:		%{name}-sparc.patch
-Patch7:		%{name}-strip-copy-symtab.patch
-Patch8:		%{name}-gcc4.patch
-Patch9:		%{name}-inline.patch
-Patch10:	%{name}-Werror.patch
-#URL:		file://home/devel/drepper
+Patch7:		%{name}-inline.patch
+Patch8:		%{name}-Werror.patch
+Patch9:		%{name}-bashism.patch
+Patch10:	%{name}-scanf.patch
+URL:		https://fedorahosted.org/elfutils/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.7
-BuildRequires:	gcc >= 3.2
+BuildRequires:	gcc >= 5:3.4
 BuildRequires:	gettext-devel
 %ifarch %{x8664} alpha ia64 ppc64 s390x sparc64
 # PR*FAST{8,16} in <inttypes.h> were broken for 64-bit archs in older versions
 # also needed for nanosecond timestamps on alpha
 BuildRequires:	glibc-devel >= 6:2.3.4
 %endif
-BuildRequires:	libltdl-devel
 BuildRequires:	perl-tools-pod
 BuildRequires:	rpmbuild(macros) >= 1.315
 BuildRequires:	sharutils
@@ -48,7 +45,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # fails to build with -Wl,-s
 %define		filterout_ld	(-Wl,)?-[sS] (-Wl,)?--strip.*
 
-%define		_programprefix	eu-
+%define		programprefix	eu-
 
 %description
 Elfutils is a collection of utilities, including ld (a linker), nm
@@ -152,18 +149,19 @@ programowalny interfejs asemblera.
 
 rm -f po/stamp-po
 
-# strip-test5 needs adjusting for strip-copy-symtab patch (already in FC, but not worth bothering)
-sed -i -e 's/ run-strip-test5\.sh / /' tests/Makefile.am
+# temporarily disable test failing on specific archs
+%ifarch alpha
+%{__perl} -pi -e 's/run-elflint-self.sh//' tests/Makefile
+%endif
 
 %build
 #%%{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
-	--program-prefix=%{_programprefix} \
-	--enable-shared
+	--program-prefix=%{programprefix}
 
 # make check depends on test-nlist not stripped
 %{__perl} -pi -e 's/^(LDFLAGS =.*)-s/$1/' tests/Makefile
@@ -181,23 +179,15 @@ LC_ALL=C \
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_mandir}/man1,/%{_lib}}
 
-# *OBJEXT must be passed to workaround problem with messed gettext,
-# which doesn't like *-po dir names
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	MKINSTALLDIRS=$(pwd)/config/mkinstalldirs \
-	CATOBJEXT=.gmo \
-	INSTOBJEXT=.mo
+	DESTDIR=$RPM_BUILD_ROOT
 
 install debian/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-mv $RPM_BUILD_ROOT%{_libdir}/libelf-*.so $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libelf-*.so) \
+mv $RPM_BUILD_ROOT%{_libdir}/{libelf-*.so,libelf.so.*} $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libelf-*.so) \
         $RPM_BUILD_ROOT%{_libdir}/libelf.so
 
-/sbin/ldconfig -n -N $RPM_BUILD_ROOT%{_libdir}
-/sbin/ldconfig -n -N $RPM_BUILD_ROOT/%{_lib}
-
 %find_lang %{name}
 
 %clean
@@ -212,14 +202,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS EXCEPTION NEWS NOTES README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/eu-*
 %attr(755,root,root) %{_libdir}/libasm-*.so
 %ghost %attr(755,root,root) %{_libdir}/libasm.so.*
 %attr(755,root,root) %{_libdir}/libdw-*.so
 %ghost %attr(755,root,root) %{_libdir}/libdw.so.*
 %dir %{_libdir}/elfutils
 %attr(755,root,root) %{_libdir}/elfutils/lib*.so
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/eu-*.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -227,7 +217,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libdw.so
 %attr(755,root,root) %{_libdir}/libelf.so
 %{_libdir}/libebl.a
-%{_includedir}/*
+%{_includedir}/elfutils
+%{_includedir}/dwarf.h
+%{_includedir}/gelf.h
+%{_includedir}/libelf.h
+%{_includedir}/nlist.h
 
 %files libelf -f %{name}.lang
 %defattr(644,root,root,755)