- updated to 1.1

- added link patch (fixes libunwind-coredump and libunwind-ptrace linking)
- removed obsolete rpath,generic patches

diff --git a/libunwind-generic.patch b/libunwind-generic.patch
deleted file mode 100644 (file)
index 3e3fef2..0000000
--- a/libunwind-generic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libunwind-1.0/src/Makefile.am.orig 2011-08-28 06:58:20.000000000 +0200
-+++ libunwind-1.0/src/Makefile.am      2011-09-11 07:52:45.723337644 +0200
-@@ -332,7 +332,7 @@
- #
- install-exec-hook:
-       $(LN_S) -f libunwind-$(arch).a  $(DESTDIR)$(libdir)/libunwind-generic.a
--      if test -f $(DESTDIR)$(libdir)/libunwind-generic.so; then \
-+      if test -f $(DESTDIR)$(libdir)/libunwind-$(arch).so; then \
-           $(LN_S) -f libunwind-$(arch).so \
-               $(DESTDIR)$(libdir)/libunwind-generic.so; \
-       fi

diff --git a/libunwind-link.patch b/libunwind-link.patch
new file mode 100644 (file)
index 0000000..102ec1e
--- /dev/null
+++ b/libunwind-link.patch
@@ -0,0 +1,18 @@
+--- libunwind-1.1/src/Makefile.am.orig 2012-10-06 06:54:38.000000000 +0200
++++ libunwind-1.1/src/Makefile.am      2012-10-12 15:56:24.425745356 +0200
+@@ -39,6 +39,7 @@
+       ptrace/_UPT_find_proc_info.c ptrace/_UPT_get_dyn_info_list_addr.c \
+       ptrace/_UPT_put_unwind_info.c ptrace/_UPT_get_proc_name.c         \
+       ptrace/_UPT_reg_offset.c ptrace/_UPT_resume.c
++libunwind_ptrace_la_LIBADD = libunwind-$(arch).la
+ noinst_HEADERS += ptrace/_UPT_internal.h
+ 
+ ### libunwind-coredump:
+@@ -58,6 +59,7 @@
+       coredump/_UPT_resume.c
+ libunwind_coredump_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
+                               -version-info $(COREDUMP_SO_VERSION)
++libunwind_coredump_la_LIBADD = libunwind-$(arch).la
+ noinst_HEADERS += coredump/_UCD_internal.h
+ 
+ ### libunwind-setjmp:

diff --git a/libunwind-rpath.patch b/libunwind-rpath.patch
deleted file mode 100644 (file)
index 4363120..0000000
--- a/libunwind-rpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 090828-rpath.dpatch by Daigo Moriwaki <daigo@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: rpath should not be used
-## DP: http://wiki.debian.org/RpathIssue
-
-@DPATCH@
-diff -urNad libunwind-0.99~/configure.in libunwind-0.99/configure.in
---- libunwind-0.99~/configure.in       2009-05-09 01:34:10.000000000 +0900
-+++ libunwind-0.99/configure.in        2009-08-29 10:41:18.000000000 +0900
-@@ -17,10 +17,20 @@
- AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
--AM_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
- AM_PROG_AS
- AM_PROG_CC_C_O
- 
-+case ${host} in
-+  *-pc-linux-gnu)
-+    AC_MSG_RESULT([Fixing libtool for -rpath problems.])
-+    sed < libtool > libtool-2 \
-+    's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
-+    mv libtool-2 libtool
-+    chmod 755 libtool
-+  ;;
-+esac
-+
- dnl Checks for libraries.
- AC_CHECK_LIB(uca, __uc_get_grs)
- CHECK_ATOMIC_OPS

diff --git a/libunwind.spec b/libunwind.spec
index 42cd05b3795cb5779b637434943dd93e94054bdc..41a90bcbf190e525bb9efdfcb8d52012288fd756 100644 (file)
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -5,23 +5,23 @@
 Summary:       libunwind - a (mostly) platform-independent unwind API
 Summary(pl.UTF-8):     libunwind - (prawie) niezależne od platformy API do rozwijania
 Name:          libunwind
-Version:       1.0.1
+Version:       1.1
 Release:       1
 License:       MIT
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/libunwind/%{name}-%{version}.tar.gz
-# Source0-md5: 993e47cca7315e22239c3e0d987e94e0
-Patch0:                %{name}-rpath.patch
-Patch1:                %{name}-generic.patch
+# Source0-md5: fb4ea2f6fbbe45bf032cd36e586883ce
+Patch0:                %{name}-link.patch
 URL:           http://www.nongnu.org/libunwind/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1.6
 %ifarch %{x8664}
 BuildRequires: binutils >= 2:2.15.94.0.2.2
 %endif
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.0
 BuildRequires: rpmbuild(macros) >= 1.213
-ExclusiveArch: %{ix86} %{x8664} arm hppa ia64 mips ppc ppc64
+BuildRequires: xz-devel
+ExclusiveArch: %{ix86} %{x8664} arm hppa ia64 mips ppc ppc64 sh
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # some setjmp tricks expect non-redirected functions
@@ -52,6 +52,7 @@ Summary:      Header files for libunwind library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libunwind
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      xz-devel
 
 %description devel
 Header files for libunwind library.
@@ -74,7 +75,6 @@ Statyczna biblioteka libunwind.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -106,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libunwind.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libunwind.so.8
+%attr(755,root,root) %{_libdir}/libunwind-coredump.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libunwind-coredump.so.0
+%attr(755,root,root) %{_libdir}/libunwind-ptrace.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libunwind-ptrace.so.0
 %attr(755,root,root) %{_libdir}/libunwind-setjmp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libunwind-setjmp.so.0
 %attr(755,root,root) %{_libdir}/libunwind-%{asuf}.so.*.*.*
@@ -114,16 +118,23 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libunwind.so
+%attr(755,root,root) %{_libdir}/libunwind-coredump.so
 %attr(755,root,root) %{_libdir}/libunwind-generic.so
+%attr(755,root,root) %{_libdir}/libunwind-ptrace.so
 %attr(755,root,root) %{_libdir}/libunwind-setjmp.so
 %attr(755,root,root) %{_libdir}/libunwind-%{asuf}.so
 %{_libdir}/libunwind.la
+%{_libdir}/libunwind-coredump.la
+%{_libdir}/libunwind-ptrace.la
 %{_libdir}/libunwind-setjmp.la
 %{_libdir}/libunwind-%{asuf}.la
-# static-only
-%{_libdir}/libunwind-ptrace.a
 %{_includedir}/libunwind*.h
 %{_includedir}/unwind.h
+%{_pkgconfigdir}/libunwind.pc
+%{_pkgconfigdir}/libunwind-coredump.pc
+%{_pkgconfigdir}/libunwind-generic.pc
+%{_pkgconfigdir}/libunwind-ptrace.pc
+%{_pkgconfigdir}/libunwind-setjmp.pc
 %{_mandir}/man3/_U_dyn_*.3*
 %{_mandir}/man3/libunwind*.3*
 %{_mandir}/man3/unw_*.3*
@@ -131,6 +142,8 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libunwind.a
+%{_libdir}/libunwind-coredump.a
 %{_libdir}/libunwind-generic.a
+%{_libdir}/libunwind-ptrace.a
 %{_libdir}/libunwind-setjmp.a
 %{_libdir}/libunwind-%{asuf}.a