Accepting request 234702 from devel:libraries:c_c++

- Clean up with spec-cleaner
- Add dependency over libatomic_opts that was missing
- Do not disable fortify-sources as it seems to work with it anyway

OBS-URL: https://build.opensuse.org/request/show/234702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libunwind?expand=0&rev=29

libunwind.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 19 12:26:43 UTC 2014 - tchvatal@suse.com
+
+- Clean up with spec-cleaner
+- Add dependency over libatomic_opts that was missing
+- Do not disable fortify-sources as it seems to work with it anyway
+
 -------------------------------------------------------------------
 Tue Dec 17 21:07:33 UTC 2013 - uweigand@de.ibm.com
 

libunwind.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libunwind
 #
-# Copyright (c) 2013 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,15 +17,12 @@
 
 
 Name:           libunwind
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkg-config
-Url:            http://savannah.nongnu.org/projects/libunwind/
+Version:        1.1
+Release:        0
 Summary:        Unwind Library
 License:        MIT
 Group:          System/Base
-Version:        1.1
-Release:        0
+Url:            http://savannah.nongnu.org/projects/libunwind/
 Source:         libunwind-%{version}.tar.gz
 Patch0:         libunwind-1.1-tests.diff
 #PATCH-FIX-UPSTREAM: upstream commit ae3dd9417a3d178cf51ce744d85b695dbf025b44
@@ -34,19 +31,19 @@ Patch1:         libunwind-1.1-expected-fails.patch
 Patch2:         libunwind-aarch64.patch
 # PATCH-FIX-UPSTREAM: uweigand@de.ibm.com -- submitted to libunwind-devel
 Patch3:         libunwind-ppc64le.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc-c++
+BuildRequires:  libatomic_ops-devel
+BuildRequires:  libtool
+BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  %ix86 ia64 x86_64 %arm ppc ppc64 ppc64le aarch64
+ExclusiveArch:  %ix86 ia64 x86_64 %{arm} ppc ppc64 ppc64le aarch64
 
 %description
 A portable and efficient C programming interface (API) to determine the
 call chain of a program.
 
-
-
-Authors:
---------
-    David Mosberger <David.Mosberger@acm.org>
-
 %package devel
 Summary:        Unwind library
 Group:          Development/Libraries/C and C++
@@ -57,12 +54,6 @@ Provides:       libunwind:%{_libdir}/libunwind.so
 A portable and efficient C programming interface (API) to determine the
 call-chain of a program.
 
-
-
-Authors:
---------
-    David Mosberger <davidm@hpl.hp.com>
-
 %prep
 %setup -q
 %patch0 -p1
@@ -71,25 +62,23 @@ Authors:
 %patch3 -p1
 
 %build
-autoreconf -fi
-export CFLAGS="%optflags -U_FORTIFY_SOURCE"
+autoreconf -fvi
 %configure
 make %{?_smp_mflags}
 
 %check
 %if ! 0%{?qemu_user_space_build:1}
-# There are some expected failures
-make -k check || :
+make check %{?_smp_mflags} || :
 %endif
 
 %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
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
+mkdir -p %{buildroot}/%{_lib}
+mv %{buildroot}%{_libdir}/libunwind.so.8* %{buildroot}/%{_lib}
+ln -sf /%{_lib}/libunwind.so.8 %{buildroot}%{_libdir}/libunwind.so
 # Check that ln did not create a dangling link
-stat "%buildroot"/$(readlink -f "%buildroot/%_libdir/libunwind.so");
+stat %{buildroot}/$(readlink -f "%{buildroot}/%{_libdir}/libunwind.so");
 
 %post -p /sbin/ldconfig
 
@@ -97,20 +86,20 @@ stat "%buildroot"/$(readlink -f "%buildroot/%_libdir/libunwind.so");
 
 %files
 %defattr(-, root, root)
-/%_lib/lib*
+/%{_lib}/lib*
 %{_libdir}/lib*.so.*
 %{_libdir}/libunwind.so
 
 %files devel
 %defattr(-, root, root)
-%{_prefix}/include/*
+%{_includedir}/*
 %{_libdir}/lib*.a
 %{_libdir}/libunwind-*.so
 %{_libdir}/pkgconfig/libunwind-generic.pc
 %{_libdir}/pkgconfig/libunwind-ptrace.pc
 %{_libdir}/pkgconfig/libunwind-setjmp.pc
 %{_libdir}/pkgconfig/libunwind.pc
-%ifarch %arm %ix86 x86_64 aarch64
+%ifarch %{arm} %ix86 x86_64 aarch64
 %{_libdir}/pkgconfig/libunwind-coredump.pc
 %endif
 %doc %{_mandir}/man?/*