[frysk/f14/master] rebuild, fix lzma linking

[Tom Callaway]

commit 82084d8e8bd843053a11b398a52b0d72ef1fc2f3
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue Sep 28 09:50:27 2010 -0400

    rebuild, fix lzma linking

 frysk-0.4-elfutils-ldadd-lzma.patch |   54 +++++++++++++++++++++++++++++++++++
 frysk.spec                          |    8 ++++-
 2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/frysk-0.4-elfutils-ldadd-lzma.patch b/frysk-0.4-elfutils-ldadd-lzma.patch
new file mode 100644
index 0000000..f4f2d65
--- /dev/null
+++ b/frysk-0.4-elfutils-ldadd-lzma.patch
@@ -0,0 +1,54 @@
+diff -up frysk-0.4/frysk-core/Makefile.am.elfutils-ldadd-lzma frysk-0.4/frysk-core/Makefile.am
+--- frysk-0.4/frysk-core/Makefile.am.elfutils-ldadd-lzma	2010-09-28 09:32:10.867191001 -0400
++++ frysk-0.4/frysk-core/Makefile.am	2010-09-28 09:32:23.734191001 -0400
+@@ -70,6 +70,7 @@ GEN_GCJ_LDADD_LIST += -lstdc++
+ GEN_GCJ_LDADD_LIST += -laudit
+ GEN_GCJ_LDADD_LIST += -lbz2
+ GEN_GCJ_LDADD_LIST += -lz
++GEN_GCJ_LDADD_LIST += -llzma
+ 
+ # For TestExec.java
+ pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias
+diff -up frysk-0.4/frysk-gtk/Makefile.am.elfutils-ldadd-lzma frysk-0.4/frysk-gtk/Makefile.am
+--- frysk-0.4/frysk-gtk/Makefile.am.elfutils-ldadd-lzma	2010-09-28 09:32:37.941191002 -0400
++++ frysk-0.4/frysk-gtk/Makefile.am	2010-09-28 09:32:50.346191002 -0400
+@@ -66,6 +66,7 @@ GEN_GCJ_LDADD_LIST += -lstdc++
+ GEN_GCJ_LDADD_LIST += -laudit
+ GEN_GCJ_LDADD_LIST += -lbz2
+ GEN_GCJ_LDADD_LIST += -lz
++GEN_GCJ_LDADD_LIST += -llzma
+ 
+ # Hack, need to compile this entire sub-tree with JNI.
+ AM_GCJFLAGS += -fjni 
+diff -up frysk-0.4/frysk-gui/Makefile.am.elfutils-ldadd-lzma frysk-0.4/frysk-gui/Makefile.am
+--- frysk-0.4/frysk-gui/Makefile.am.elfutils-ldadd-lzma	2010-09-28 09:33:03.212191001 -0400
++++ frysk-0.4/frysk-gui/Makefile.am	2010-09-28 09:33:14.068191002 -0400
+@@ -79,6 +79,7 @@ GEN_GCJ_LDADD_LIST += $(FRYSK_GUI_LIBS)
+ GEN_GCJ_LDADD_LIST += -laudit
+ GEN_GCJ_LDADD_LIST += -lbz2
+ GEN_GCJ_LDADD_LIST += -lz
++GEN_GCJ_LDADD_LIST += -llzma
+ 
+ # Skip the JUnit tests (exit with status 77) when there is no display; bug #3012.
+ #TESTS_ENVIRONMENT = ( test $$tst != TestRunner || test -n "$$DISPLAY" || exit 77 ) && 
+diff -up frysk-0.4/frysk-imports/tests/Makefile.am.elfutils-ldadd-lzma frysk-0.4/frysk-imports/tests/Makefile.am
+--- frysk-0.4/frysk-imports/tests/Makefile.am.elfutils-ldadd-lzma	2010-09-28 09:31:44.243191000 -0400
++++ frysk-0.4/frysk-imports/tests/Makefile.am	2010-09-28 09:31:44.277191000 -0400
+@@ -492,5 +492,5 @@ frysk4796_dwfltest_LDADD = -ldl $(top_bu
+ $(top_builddir)/elfutils/libdw/libdw.a \
+ $(top_builddir)/elfutils/libebl/libebl.a \
+ $(top_builddir)/elfutils/libelf/libelf.a \
+--lz -lbz2
++-lz -lbz2 -llzma
+ systests_PASS_PROGRAM += frysk4796/dwfltest
+diff -up frysk-0.4/frysk-sys/Makefile.am.elfutils-ldadd-lzma frysk-0.4/frysk-sys/Makefile.am
+--- frysk-0.4/frysk-sys/Makefile.am.elfutils-ldadd-lzma	2010-09-28 09:31:44.254191000 -0400
++++ frysk-0.4/frysk-sys/Makefile.am	2010-09-28 09:31:44.281191000 -0400
+@@ -67,6 +67,7 @@ endif
+ GEN_GCJ_LDADD_LIST += -lstdc++ -laudit
+ GEN_GCJ_LDADD_LIST += -lbz2
+ GEN_GCJ_LDADD_LIST += -lz
++GEN_GCJ_LDADD_LIST += -llzma
+ 
+ # Force a few dependencies
+ lib/unwind/cni/Unwind%.cxx: lib/unwind/Unwind%.java lib/unwind/cni/UnwindH.hxx
diff --git a/frysk.spec b/frysk.spec
index 51b000d..51dc6fc 100644
--- a/frysk.spec
+++ b/frysk.spec
@@ -1,7 +1,7 @@
 Summary:	Execution analysis and debugging tool-suite.
 Name:		frysk
 Version:	0.4
-Release:	27%{?dist}
+Release:	28%{?dist}
 
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # getopt is GPLv2 with exception
@@ -54,6 +54,7 @@ Patch1007:	frysk-0.4-elfutils-offt.patch
 Patch1100:	frysk-0.4-elfutils-maphack.patch
 Patch1101:	frysk-0.4-elfutils-ldadd.patch
 Patch1102:	frysk-0.4-elfutils-louser.patch
+Patch1103:	frysk-0.4-elfutils-ldadd-lzma.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -80,6 +81,7 @@ BuildRequires:	bison >= 1.875
 BuildRequires:	flex >= 2.5.4a
 BuildRequires:	zlib-devel >= 1.2.2.3
 BuildRequires:	bzip2-devel
+BuildRequires:	xz-devel
 # Some generation scripts are being written in python
 BuildRequires:	python
 
@@ -191,6 +193,7 @@ cd ../..
 %patch1100 -p1 -z .elfutils-maphack
 %patch1101 -p1 -z .elfutils-ldadd
 %patch1102 -p1 -z .elfutils-louser
+%patch1103 -p1 -z .elfutils-ldadd-lzma
 %endif
 
 echo "%{version}-%{release}" > frysk-common/version.in
@@ -362,6 +365,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/frysk.1.gz
 
 %changelog
+* Tue Sep 28 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4-28
+- rebuild, fix lzma linking
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.4-27
 - recompiling .py files against Python 2.7 (rhbz#623298)