From df92b33a377e75ea35b20e9ba9fc6f0f11a1aad6f30e297de086f1f0c8b7ed40 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 17 Feb 2012 11:01:39 +0000 Subject: [PATCH] Accepting request 105613 from devel:libraries:c_c++ - Remove redundant tags/sections - Fix dangling symlink /usr/lib/libunwind.so (which was pointing at "libunwind.so.8.*", verbatim asterisk) - Throw out .la file (forwarded request 105594 from jengelh) OBS-URL: https://build.opensuse.org/request/show/105613 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libunwind?expand=0&rev=19 --- libunwind.changes | 8 ++++++++ libunwind.spec | 18 ++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libunwind.changes b/libunwind.changes index 01ce9dc..a5dd405 100644 --- a/libunwind.changes +++ b/libunwind.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 9 15:53:49 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections +- Fix dangling symlink /usr/lib/libunwind.so (which was + pointing at "libunwind.so.8.*", verbatim asterisk) +- Throw out .la file + ------------------------------------------------------------------- Wed Nov 23 09:24:25 UTC 2011 - coolo@suse.com diff --git a/libunwind.spec b/libunwind.spec index 04e7c16..c9c2dd5 100644 --- a/libunwind.spec +++ b/libunwind.spec @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: libunwind BuildRequires: gcc-c++ libtool Url: http://savannah.nongnu.org/projects/libunwind/ @@ -44,7 +41,6 @@ Authors: David Mosberger %package devel -License: MIT Summary: Unwind library Group: Development/Libraries/C and C++ Requires: libunwind = %{version}-%{release} @@ -69,9 +65,8 @@ Authors: %build autoreconf -fi -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE" -./configure "CFLAGS=$RPM_OPT_FLAGS" --prefix=/usr --mandir=%{_mandir} \ - --libdir=%{_libdir} --build=%{_target_cpu}-suse-linux +export CFLAGS="%optflags -U_FORTIFY_SOURCE" +%configure make %{?_smp_mflags} %check @@ -82,17 +77,17 @@ make -k check || : %install make install DESTDIR=$RPM_BUILD_ROOT +rm -f "%buildroot/%_libdir"/*.la mkdir -p $RPM_BUILD_ROOT/%{_lib} mv $RPM_BUILD_ROOT%{_libdir}/libunwind.so.8* $RPM_BUILD_ROOT/%{_lib} -ln -sf ../../%{_lib}/libunwind.so.8.* $RPM_BUILD_ROOT%{_libdir}/libunwind.so +ln -sf /%{_lib}/libunwind.so.8 $RPM_BUILD_ROOT%{_libdir}/libunwind.so +# Check that ln did not create a dangling link +stat "%buildroot"/$(readlink -f "%buildroot/%_libdir/libunwind.so"); %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-, root, root) /%_lib/lib* @@ -103,7 +98,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %{_prefix}/include/* %{_libdir}/lib*.a -%{_libdir}/lib*.la %{_libdir}/libunwind-*.so %doc %{_mandir}/man?/*