X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=elfutils.spec;h=230bc1a1665c21108a565f8392336051d662d098;hb=fb1f2abefd4720e7c20a7d9efeeed51a8662a650;hp=b6ce52c5cd07dd8f6803042846856fd538c7eedb;hpb=e19ad5454b6b7ea0d7b27fbb0c0eb7ab2bee0fba;p=packages%2Felfutils.git

diff --git a/elfutils.spec b/elfutils.spec
index b6ce52c..230bc1a 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,26 +1,34 @@
+#
+# Conditional build:
+%bcond_without	tests	# do not perform tests
+#
 Summary:	A collection of utilities and DSOs to handle compiled objects
 Summary(pl):	Zestaw narzêdzi i bibliotek do obs³ugi skompilowanych obiektów
 Name:		elfutils
-Version:	0.94
-Release:	0.1
+Version:	0.95
+Release:	2
 License:	OSL 1.0 (http://www.opensource.org/licenses/osl.php)
 Group:		Development/Tools
-# http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/SRPMS/elfutils-0.94-2.1.src.rpm
+# http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/SRPMS/
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	de39e0af6b82b30d48e5d69b75aa2e0b
+# Source0-md5:	dc8e8f6af735e90ec7e6a0ca99851bff
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-debian-manpages.patch
 Patch2:		%{name}-alpha-stat.patch
-Patch3:		%{name}-gcc34.patch
 #URL:		file://home/devel/drepper
-BuildRequires:	autoconf >= 2.54
-BuildRequires:	automake >= 1.7
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.7
 BuildRequires:	gcc >= 3.2
 BuildRequires:	gettext-devel
+%ifarch alpha amd64 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:	sharutils
-Requires:	elfutils-libelf = %{version}-%{release}
+Requires:	%{name}-libelf = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_programprefix	eu-
@@ -47,8 +55,8 @@ specyficznych dla architektury.
 Summary:	Development part of libraries to handle compiled objects
 Summary(pl):	Czê¶æ programistyczna bibliotek do obs³ugi skompilowanych obiektów
 Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	libelf-devel
-Requires:	elfutils = %{version}-%{release}
 
 %description devel
 The elfutils-devel package contains the development part of libraries
@@ -90,8 +98,8 @@ pakietu elfutils u
 Summary:	Static libraries to handle compiled objects
 Summary(pl):	Statyczne biblioteki do obs³ugi skompilowanych obiektów
 Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
 Obsoletes:	libelf-static
-Requires:	elfutils-devel = %{version}-%{release}
 
 %description static
 The elfutils-static package contains the static libraries to create
@@ -113,10 +121,10 @@ programowalny interfejs asemblera.
 
 %prep
 %setup -q
-#patch0 -p1
+%patch0 -p1
 %patch1 -p1
+# no nanosecond timestamps on sparc64 yet (alpha has them now)
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__gettextize}
@@ -128,9 +136,17 @@ programowalny interfejs asemblera.
 	--program-prefix=%{_programprefix} \
 	--enable-shared
 
-%{__make}
+# make check depends on test-nlist not stripped
+%{__perl} -pi -e 's/^(LDFLAGS =.*)-s/$1/' tests/Makefile
 
+%{__make}
 %{__make} -C debian/man
+%if %{with tests}
+# $ORIGIN used in RPATH needs /proc to work - workaround it using LD_LIBRARY_PATH;
+# ../libelf is needed also to use proper libelf by ../src/elflint during tests
+LD_LIBRARY_PATH=../libasm:../libdw:../libebl:../libelf \
+%{__make} -C tests check
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -140,17 +156,14 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
 # which doesn't like *-po dir names
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	CATOBJEXT=.gmo INSTOBJEXT=.mo
+	MKINSTALLDIRS=$(pwd)/config/mkinstalldirs \
+	CATOBJEXT=.gmo \
+	INSTOBJEXT=.mo
 
 install debian/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-#%find_lang libelf
-#%find_lang libasm
-#%find_lang libdw
-#%find_lang libebl
-#%find_lang %{name}
-#cat libasm.lang libdw.lang libebl.lang >> %{name}.lang
-touch %{name}.lang
+%find_lang libelf
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -161,8 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %post	libelf -p /sbin/ldconfig
 %postun	libelf -p /sbin/ldconfig
 
-%files
-# -f %{name}.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING NEWS NOTES README THANKS TODO
 %attr(755,root,root) %{_bindir}/*
@@ -181,8 +193,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libebl.a
 %{_includedir}/*
 
-%files libelf
-# -f libelf.lang
+%files libelf -f libelf.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libelf-*.so