- up to 1.2.1; no latex2man in PLD, so no manual pages

diff --git a/libunwind-link.patch b/libunwind-link.patch
index 102ec1e2bccfb7abfd77917aec5e051eacac460a..b56464ed463e26c1acef83876dcd037b0f8e42c9 100644 (file)
--- a/libunwind-link.patch
+++ b/libunwind-link.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- libunwind-1.2.1/src/Makefile.am~   2017-06-15 23:26:53.000000000 +0200
++++ libunwind-1.2.1/src/Makefile.am    2017-10-29 09:54:08.523287787 +0100
+@@ -49,6 +49,7 @@ libunwind_ptrace_la_SOURCES =                                                  \
        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
@@ -8,11 +8,12 @@
  noinst_HEADERS += ptrace/_UPT_internal.h
  
  ### libunwind-coredump:
-@@ -58,6 +59,7 @@
+@@ -68,7 +69,7 @@ libunwind_coredump_la_SOURCES = \
        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_coredump_la_LIBADD = $(LIBLZMA)
++libunwind_coredump_la_LIBADD = libunwind-$(arch).la $(LIBLZMA)
+ noinst_HEADERS += coredump/_UCD_internal.h coredump/_UCD_lib.h
  
  ### libunwind-setjmp:

diff --git a/libunwind.spec b/libunwind.spec
index 41a90bcbf190e525bb9efdfcb8d52012288fd756..ed1574e47c333fc9abb987f6b6af43a86ebcec04 100644 (file)
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -1,16 +1,17 @@
 #
 # Conditional build:
 %bcond_with    tests   # perform "make check" (fails randomly)
+%bcond_with    doc
 #
 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.1
+Version:       1.2.1
 Release:       1
 License:       MIT
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/libunwind/%{name}-%{version}.tar.gz
-# Source0-md5: fb4ea2f6fbbe45bf032cd36e586883ce
+# Source0-md5: 06ba9e60d92fd6f55cd9dadb084df19e
 Patch0:                %{name}-link.patch
 URL:           http://www.nongnu.org/libunwind/
 BuildRequires: autoconf >= 2.50
@@ -18,6 +19,7 @@ BuildRequires:        automake >= 1.6
 %ifarch %{x8664}
 BuildRequires: binutils >= 2:2.15.94.0.2.2
 %endif
+%{?with_doc:BuildRequires:     texlive-latex2man}
 BuildRequires: libtool >= 2:2.0
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: xz-devel
@@ -135,9 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libunwind-generic.pc
 %{_pkgconfigdir}/libunwind-ptrace.pc
 %{_pkgconfigdir}/libunwind-setjmp.pc
+%if %{with doc}
 %{_mandir}/man3/_U_dyn_*.3*
 %{_mandir}/man3/libunwind*.3*
 %{_mandir}/man3/unw_*.3*
+%endif
 
 %files static
 %defattr(644,root,root,755)