diff --git a/.gitignore b/.gitignore
index fe1a300..462b8ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 frysk-0.4.tar.bz2
+clog
+*.rpm
+frysk-0.4
+results.*
diff --git a/Makefile b/Makefile
index 37d4c26..d935d44 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,104 @@
 # Make mock usable.   The only standard target is mockbuild which
 # doesn't do what you typically want.
 
-SRPM := $(PWD)/$(shell fedpkg verrel).src.rpm
-RESULTDIR := $(PWD)/$(shell fedpkg verrel)
-MOCKCFG = fedora-devel-i386
+BRANCH := $(shell git branch | sed -e 's/^\* f*//' -e 's/master/devel/' )
+#MOCKCFG = fedora-devel-x86_64
+MOCKCFG = fedora-$(BRANCH)-i386
+
+# Order that dependent libraries need to be built and installed.
+
+comma := ,
+empty :=
+space := $(empty) $(empty)
+
+ORDER = \
+	glib-java \
+	cairo-java \
+	libgtk-java \
+	libgconf-java \
+	libvte-java libgnome-java \
+	libglade-java \
+	frysk
+
+MOCK_WORDS := $(subst -, , $(MOCKCFG))
+MOCK_OS := $(word 1,$(MOCK_WORDS))
+MOCK_RELEASE := $(word 2,$(MOCK_WORDS))
+MOCK_ARCH := $(word 3,$(MOCK_WORDS))
+MOCK_RESULTS := results.$(MOCKCFG)
+
+ARCH := $(if $(findstring i386,$(MOCK_ARCH)),i686,$(MOCK_ARCH))
+
+# --offline?
+NO_CLEAN := --no-clean --no-cleanup-after
+MOCK := mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(MOCK_RESULTS)
+
+SOURCES := *.spec *.patch
+
+SPEC_FILE = $(shell fedpkg gimmespec)
+# VERREL is very slow
+VERREL = $(shell fedpkg verrel)
+RPM = $(VERREL).$(ARCH).rpm
 
 help:
 	@echo "Mock targets"
-	@echo "  mock-local mock-build: Build from scratch using mock; keep the results"
-	@echo "  mock-shell: Start a chrooted shell in the build-chroot"
-	@echo "  mock-init: Initialize a new clean build-chroot"
-	@echo "  mock-clean: Purge the build-chroot" 
-	@echo "  mock-update: Run yum update in the build-chroot"
-	@echo "  mock-orphanskill: Kill any stray processes from the build"
-	@echo "  mock-install PACKAGE=rpm: Install PACKAGE"
-	@echo "  mock-installdeps PACKAGE=rpm: Install dependencies for PACKAGE"
+	@echo ""
+	@echo "  init: Initialize the $(MOCKCFG) chroot (if needed)"
+	@echo "  local|build: Build, logs in $(MOCK_RESULTS)"
+	@echo "  shell: Start a shell in the chroot"
+	@echo "  deploy: Build/Deploy $(ARCH) package"
+	@echo ""
+	@echo "  clean: Purge the $(ARCH) chroot tree"
+	@echo "  scrub: Completely remove Purge the chroot tree"
+	@echo ""
+	@echo "  update: Run yum update in the chroot"
+	@echo "  orphanskill: Kill any stray processes from the build"
+	@echo "  installdeps: Install dependencies for this package"
+	@echo ""
 	@echo "Use MOCKARGS= for extra arguments"
 .PHONY:: help
 
-# -prep -compile -install -compile-short -install-short
-local build: srpm
-	mock --no-clean --no-cleanup-after $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(RESULTDIR) --rebuild $(SRPM)
+init:
+	$(MOCK) -q --chroot pwd \
+	|| $(MOCK) --init
+.PHONY:: init
+
+local build $(MOCK_RESULTS)/$(RPM): init $(SOURCES)
+	rm -f $(MOCK_RESULTS)/*.src.rpm
+	$(MOCK) $(NO_CLEAN) --buildsrpm --spec $(SPEC_FILE) --source $(PWD)
+	$(MOCK) $(NO_CLEAN) --rebuild $(MOCK_RESULTS)/*.src.rpm
 .PHONY:: local build
 
-init clean shell update orphanskill:
-	mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(RESULTDIR) --$@
-.PHONY:: init clean shell update orphanskill
+# rpmspec -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' $(SPEC_FILE)
+deploy: $(MOCK_RESULTS)/$(RPM)
+	$(MOCK) -q --chroot 'rm -f /tmp/*.rpm'
+	for rpm in $(MOCK_RESULTS)/*.rpm ; do \
+		case $$rpm in \
+		*.src.rpm | *-debuginfo-* ) ;; \
+		* ) $(MOCK) -q --copyin $$rpm /tmp ;; \
+		esac ; \
+	done
+	$(MOCK) -q --chroot "rpm -Uvh --force /tmp/*.rpm" 
+.PHONY:: deploy
 
-install installdeps:
-	if test x"$(PACKAGE)" = x ; then echo Supply PACKAGE ; exit 1 ; fi
-	mock $(MOCKARGS) -r $(MOCKCFG) --resultdir=$(RESULTDIR) --$@ $(PACKAGE)
-.PHONY:: install installdeps
+world gnome:
+	set -e ; \
+	for d in $(ORDER) ; do \
+		pushd ../$$d ; \
+			$(MAKE) -f $(PWD)/Makefile deploy ; \
+		popd ; \
+	done
+.PHONY:: world
 
-srpm:
-	fedpkg srpm
-.PHONY:: srpm
+usable: init
+	$(MOCK) install vi less emacs automake-docs
+.PHONY:: usable
+
+clog prep:
+	fedpkg $@
+.PHONY:: clog prep
+
+
+clean shell install update remove orphanskill scrub copyin copyout:
+	$(MOCK) --$@ $(ARGS) $(PACKAGE)
+	rm -rf $(MOCK_RESULTS)
+.PHONY:: clean shell install update remove orphanskill scrub copyin copyout
diff --git a/frysk-0.4-bin-antlr.patch b/frysk-0.4-bin-antlr.patch
new file mode 100644
index 0000000..de00f18
--- /dev/null
+++ b/frysk-0.4-bin-antlr.patch
@@ -0,0 +1,14 @@
+diff -up frysk-0.4/frysk-common/Makefile.rules.bin-antlr frysk-0.4/frysk-common/Makefile.rules
+--- frysk-0.4/frysk-common/Makefile.rules.bin-antlr	2012-01-23 20:47:12.479000002 -0500
++++ frysk-0.4/frysk-common/Makefile.rules	2012-01-23 20:48:29.693998397 -0500
+@@ -567,9 +567,7 @@ endif
+ # running the generated files through the compiler and then "fix" the
+ # warnings.  Reuse the tmp directory for successive runs on related .g files.
+ 
+-ANTLR = $(JAVA) \
+-	-classpath @abs_builddir@/../frysk-imports/antlr.jar \
+-	antlr.Tool
++ANTLR = antlr
+ 
+ SUFFIXES += .antlred .g
+ .g.antlred:
diff --git a/frysk-0.4-bootstrap-werror.patch b/frysk-0.4-bootstrap-werror.patch
new file mode 100644
index 0000000..04beda6
--- /dev/null
+++ b/frysk-0.4-bootstrap-werror.patch
@@ -0,0 +1,79 @@
+diff -up frysk-0.4/bootstrap.sh.werror frysk-0.4/bootstrap.sh
+--- frysk-0.4/bootstrap.sh.werror	2012-02-11 13:42:07.884989256 -0500
++++ frysk-0.4/bootstrap.sh	2012-02-11 13:42:25.969989449 -0500
+@@ -64,7 +64,7 @@ echo "Running aclocal ..."
+ aclocal -I common/m4
+ 
+ echo "Running autoconf ..."
+-autoconf -Werror -f
++autoconf -f
+ 
+ echo "Running automake ..."
+-automake -Werror --add-missing
++automake --add-missing
+diff -up frysk-0.4/frysk-core/bootstrap.sh.werror frysk-0.4/frysk-core/bootstrap.sh
+--- frysk-0.4/frysk-core/bootstrap.sh.werror	2012-02-11 13:43:05.547008456 -0500
++++ frysk-0.4/frysk-core/bootstrap.sh	2012-02-11 13:44:44.883018774 -0500
+@@ -48,7 +48,7 @@ echo "Running aclocal ..."
+ aclocal -I common/m4
+ 
+ echo "Running autoconf ..."
+-autoconf -Werror -f
++autoconf -f
+ 
+ echo "Running automake ..."
+-automake -Werror --add-missing
++automake --add-missing
+diff -up frysk-0.4/frysk-gtk/bootstrap.sh.werror frysk-0.4/frysk-gtk/bootstrap.sh
+--- frysk-0.4/frysk-gtk/bootstrap.sh.werror	2012-02-11 13:43:10.543983351 -0500
++++ frysk-0.4/frysk-gtk/bootstrap.sh	2012-02-11 13:44:55.544009596 -0500
+@@ -51,7 +51,7 @@ echo "Running aclocal ..."
+ aclocal -I common/m4
+ 
+ echo "Running autoconf ..."
+-autoconf -Werror -f
++autoconf -f
+ 
+ echo "Running automake ..."
+-automake -Werror --add-missing
++automake --add-missing
+diff -up frysk-0.4/frysk-gui/bootstrap.sh.werror frysk-0.4/frysk-gui/bootstrap.sh
+--- frysk-0.4/frysk-gui/bootstrap.sh.werror	2012-02-11 13:43:15.791012869 -0500
++++ frysk-0.4/frysk-gui/bootstrap.sh	2012-02-11 13:45:06.560982800 -0500
+@@ -48,7 +48,7 @@ echo "Running aclocal ..."
+ aclocal -I common/m4
+ 
+ echo "Running autoconf ..."
+-autoconf -Werror -f
++autoconf -f
+ 
+ echo "Running automake ..."
+-automake -Werror --add-missing
++automake --add-missing
+diff -up frysk-0.4/frysk-imports/bootstrap.sh.werror frysk-0.4/frysk-imports/bootstrap.sh
+--- frysk-0.4/frysk-imports/bootstrap.sh.werror	2012-02-11 13:42:58.631054349 -0500
++++ frysk-0.4/frysk-imports/bootstrap.sh	2012-02-11 13:45:16.983015128 -0500
+@@ -90,7 +90,7 @@ echo "Running aclocal ... for frysk-impo
+ aclocal -I common/m4
+ 
+ echo "Running autoconf ... for frysk-imports"
+-autoconf -Werror -f
++autoconf -f
+ 
+ echo "Running automake ... for frysk-imports"
+-automake -Werror --add-missing
++automake --add-missing
+diff -up frysk-0.4/frysk-sys/bootstrap.sh.werror frysk-0.4/frysk-sys/bootstrap.sh
+--- frysk-0.4/frysk-sys/bootstrap.sh.werror	2012-02-11 13:43:18.955000019 -0500
++++ frysk-0.4/frysk-sys/bootstrap.sh	2012-02-11 13:45:29.248015177 -0500
+@@ -53,7 +53,7 @@ echo "Running aclocal ... for frysk-sys"
+ aclocal -I common/m4
+ 
+ echo "Running autoconf ... for frysk-sys"
+-autoconf -Werror -f
++autoconf -f
+ 
+ echo "Running automake ... for frysk-sys"
+-automake -Werror --add-missing
++automake --add-missing
+diff -up frysk-0.4/frysk-top/bootstrap.sh.werror frysk-0.4/frysk-top/bootstrap.sh
diff --git a/frysk-0.4-configure-enable-gnome.patch b/frysk-0.4-configure-enable-gnome.patch
new file mode 100644
index 0000000..3f948e5
--- /dev/null
+++ b/frysk-0.4-configure-enable-gnome.patch
@@ -0,0 +1,153 @@
+commit 3fbf17b6271ca389cd4de1e33d6ec33708261228
+Author: Andrew Cagney <cagney@sourceware.org>
+Date:   Sat Jul 17 13:06:46 2010 -0400
+
+    Add --enable-gnome; make gnome interface optional.
+    
+    2010-07-17  Andrew Cagney  <cagney@gnu.org>
+    
+    	* configure.ac: Add --enable-gnome option; only check for
+    	java-gnome when enabled.
+    
+    	* Makefile.am (manpages manpages/index.html): Only include
+    	frysk-gui when ENABLE_GNOME.
+
+diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog
+index 00498f2..0c72180 100644
+--- a/frysk-top/ChangeLog
++++ b/frysk-top/ChangeLog
+@@ -1,3 +1,11 @@
++2010-07-17  Andrew Cagney  <cagney@gnu.org>
++
++	* configure.ac: Add --enable-gnome option; only check for
++	java-gnome when enabled.
++
++	* Makefile.am (manpages manpages/index.html): Only include
++	frysk-gui when ENABLE_GNOME.
++
+ 2008-06-06  Rick Moseley  <rmoseley@redhat.com>
+ 
+ 	* NEWS: Add bz #'s; add item on hover-over variable.
+diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am
+index d852fba..49444fb 100644
+--- a/frysk-top/Makefile.am
++++ b/frysk-top/Makefile.am
+@@ -41,30 +41,35 @@
+ include common/Makefile.rules
+ 
+ 
+-SUBDIRS = \
+-	frysk-imports \
+-	frysk-sys \
+-	frysk-core \
+-	frysk-gtk \
+-	frysk-gui
++SUBDIRS =
++SUBDIRS += frysk-imports
++SUBDIRS += frysk-sys
++SUBDIRS += frysk-core
++if ENABLE_GNOME
++SUBDIRS += frysk-gtk
++SUBDIRS += frysk-gui
++endif
+ 
+ # Note the dir/. is needed, causes the file copy to put the contents
+ # into the top level directory.
+ 
+-SOURCEDIRS = \
+-	$(patsubst %,$(srcdir)/%/frysk,$(SUBDIRS)) \
+-	$(patsubst %,$(top_builddir)/%/frysk,$(SUBDIRS)) \
+-	$(srcdir)/frysk-sys/lib \
+-	$(top_builddir)/frysk-sys/lib \
+-	$(srcdir)/frysk-sys/inua \
+-	$(top_builddir)/frysk-sys/inua \
+-	$(srcdir)/frysk-imports/getopt/src/getopt/gnu \
+-	$(srcdir)/frysk-imports/jline/src/jline \
+-	$(srcdir)/frysk-imports/junit/src/junit \
+-	$(srcdir)/frysk-core/frysk/pkglibdir/. \
+-	$(srcdir)/frysk-core/frysk/bindir/. \
+-	$(srcdir)/frysk-gui/frysk/bindir/. \
+-	$(empty)
++SOURCEDIRS =
++SOURCEDIRS += $(patsubst %,$(srcdir)/%/frysk,$(SUBDIRS))
++SOURCEDIRS += $(patsubst %,$(top_builddir)/%/frysk,$(SUBDIRS))
++SOURCEDIRS += $(srcdir)/frysk-sys/lib
++SOURCEDIRS += $(top_builddir)/frysk-sys/lib
++SOURCEDIRS += $(srcdir)/frysk-sys/inua
++SOURCEDIRS += $(top_builddir)/frysk-sys/inua
++SOURCEDIRS += $(srcdir)/frysk-imports/getopt/src/getopt/gnu
++SOURCEDIRS += $(srcdir)/frysk-imports/jline/src/jline
++SOURCEDIRS += $(srcdir)/frysk-imports/junit/src/junit
++SOURCEDIRS += $(srcdir)/frysk-core/frysk/pkglibdir/.
++SOURCEDIRS += $(srcdir)/frysk-core/frysk/bindir/.
++SOURCEDIRS += $(srcdir)/frysk-gui/frysk/bindir/.
++
++if ENABLE_GNOME
++SOURCEDIRS += $(srcdir)/frysk-gui/frysk/bindir/.
++endif
+ 
+ 
+ # Generate html manpages.  Use same xml sources, but generate html.
+@@ -78,6 +83,7 @@ TEMPLATE = $(srcdir)/htdocs/template.html
+ manpages manpages/index.html:
+ 	rm -rf manpages
+ 	mkdir -p manpages
++if ENABLE_GNOME
+ 	XMLTO=$(XMLTO) \
+ 	sh $(srcdir)/frysk-common/manpages.sh \
+ 		$(TEMPLATE) \
+@@ -89,6 +95,17 @@ manpages manpages/index.html:
+ 		frysk-gui/frysk/bindir/*.xml \
+ 		-"Test framework" \
+ 		*/frysk/pkglibdir/*.xml
++else
++	XMLTO=$(XMLTO) \
++	sh $(srcdir)/frysk-common/manpages.sh \
++		$(TEMPLATE) \
++		-"Overview" \
++		frysk-common/frysk.xml \
++		-"Command Line Utilities" \
++		frysk-core/frysk/bindir/*.xml \
++		-"Test framework" \
++		*/frysk/pkglibdir/*.xml
++endif
+ 	mv manpages/index.new manpages/index.html
+ 
+ # Generate JAVADOC documentation.
+diff --git a/frysk-top/configure.ac b/frysk-top/configure.ac
+index 6e1d234..bf122ce 100644
+--- a/frysk-top/configure.ac
++++ b/frysk-top/configure.ac
+@@ -43,11 +43,24 @@ sinclude(common/version.ac)
+ AC_INIT(frysk,defn([FRYSK_VERSION]))
+ m4_include([common/frysk-common.ac])
+ 
++AC_ARG_ENABLE(gnome,
++AC_HELP_STRING(
++	[--enable-gnome],
++	[enable gnome user interface (default no)]),
++[enable_gnome=$enableval],
++[enable_gnome=no])
++AM_CONDITIONAL([ENABLE_GNOME], [test x$enable_gnome = xyes])
++
+ AM_INIT_AUTOMAKE([subdir-objects foreign no-installinfo no-exeext no-dist])
+ AC_CONFIG_FILES([Makefile])
+-AC_CONFIG_SUBDIRS([frysk-imports frysk-sys frysk-core frysk-gtk frysk-gui])
++
++AC_CONFIG_SUBDIRS([frysk-imports frysk-sys frysk-core])
++if test x$enable_gnome = xyes; then
++  AC_CONFIG_SUBDIRS([frysk-gtk frysk-gui])
++fi
+ 
+ # Need to call PKG_CHECK_MODULES to get PKG_CONFIG set; used by javadoc.
++if test x$enable_gnome = xyes ; then
+ PKG_CHECK_MODULES(FRYSK_GNOME, [gtk+-2.0 >= 2.7.0 gtk2-java >= 2.7.0 
+ glade-java >= 2.7.0 glib-java >= 0.2 cairo-java >= 1.0 vte-java >= 
+ 0.11.11 pango >= 1.10.0 pangox >= 1.10.0 pangoft2 >= 1.10.0])
+@@ -55,5 +68,6 @@ FRYSK_PKG_MODULE_VARIABLE(FRYSK_GNOME_JARS, classpath, [gtk+-2.0 >= 2.7.0
+ gtk2-java >= 2.7.0 glade-java >= 2.7.0 glib-java >= 0.2 
+ cairo-java >= 1.0 vte-java 
+ >= 0.11.11 pango >= 1.10.0 pangox >= 1.10.0 pangoft2 >= 1.10.0])
++fi
+ 
+ AC_OUTPUT
diff --git a/frysk-0.4-cxx-scope.patch b/frysk-0.4-cxx-scope.patch
new file mode 100644
index 0000000..3ec1f8c
--- /dev/null
+++ b/frysk-0.4-cxx-scope.patch
@@ -0,0 +1,12 @@
+diff -up frysk-0.4/frysk-sys/jnixx/elements.hxx.cxx-scope frysk-0.4/frysk-sys/jnixx/elements.hxx
+--- frysk-0.4/frysk-sys/jnixx/elements.hxx.cxx-scope	2012-01-22 21:21:58.336000647 -0500
++++ frysk-0.4/frysk-sys/jnixx/elements.hxx	2012-01-22 21:22:13.119000651 -0500
+@@ -207,7 +207,7 @@ private:
+   char file[FILENAME_MAX];
+ public:
+   void operator=(const FileElements& src) {
+-    copy(src);
++    this->copy(src);
+     ::strcpy(this->file, src.file);
+     // Don't copy the pointer.
+   }
diff --git a/frysk-0.4-nopkglibdir.patch b/frysk-0.4-nopkglibdir.patch
new file mode 100644
index 0000000..b6f2b78
--- /dev/null
+++ b/frysk-0.4-nopkglibdir.patch
@@ -0,0 +1,233 @@
+diff -up frysk-0.4/frysk-common/Makefile.gen.sh.nopkglibdir frysk-0.4/frysk-common/Makefile.gen.sh
+--- frysk-0.4/frysk-common/Makefile.gen.sh.nopkglibdir	2012-02-11 23:00:39.095000078 -0500
++++ frysk-0.4/frysk-common/Makefile.gen.sh	2012-02-11 23:00:39.544000078 -0500
+@@ -225,7 +225,10 @@ echo_PROGRAMS ()
+ 	*dir/* )
+             # extract the directory prefix
+             local dir=`echo /"$1" | sed -e 's,.*/\([a-z]*\)dir/.*,\1,'`
+-            echo "${dir}_PROGRAMS += $1"
++	    case $dir in
++	      pkglib ) echo "noinst_PROGRAMS += $1" ;;
++              * ) echo "${dir}_PROGRAMS += $1" ;;
++	    esac
+ 	    ;;
+         * )
+ 	    echo "noinst_PROGRAMS += $1"
+@@ -726,8 +729,16 @@ do
+   do
+     d=`dirname $file`
+     b=`basename $file ${suffix}`
+-    echo `expr $d : '.*/\([a-z]*\)dir'`_SCRIPTS += $d/$b
+-    check_MANS $d/$b
++    dir=`expr $d : '.*/\([a-z]*\)dir'`
++    case $dir in
++      pkglib )
++	echo noinst_SCRIPTS += $d/$b
++	;;
++      * )
++	echo "${dir}_SCRIPTS += $d/$b"
++    	check_MANS $d/$b
++	;;
++    esac
+     cat <<EOF
+ ${d}/${b}: ${file}
+ 	\$(SUBST)
+diff -up frysk-0.4/frysk-common/Makefile.rules.nopkglibdir frysk-0.4/frysk-common/Makefile.rules
+--- frysk-0.4/frysk-common/Makefile.rules.nopkglibdir	2012-02-11 23:00:39.493000079 -0500
++++ frysk-0.4/frysk-common/Makefile.rules	2012-02-11 23:01:33.129016031 -0500
+@@ -53,7 +53,6 @@ FRYSK_ASCOMPILE = $(CCAS) $(DEFS) $(DEFA
+ 
+ # Initialize everything to empty and then use += to add things in.
+ 
+-noinst_SCRIPTS =
+ SUFFIXES =
+ BUILT_SOURCES = 
+ CLEANFILES = $(BUILT_SOURCES)
+@@ -61,14 +60,11 @@ CLEANDIRS =
+ MOSTLYCLEANFILES = core.[1-9]*
+ noinst_PROGRAMS =
+ noinst_DATA =
++noinst_SCRIPTS =
+ bin_PROGRAMS =
+ bin_SCRIPTS =
+ sbin_PROGRAMS =
+ sbin_SCRIPTS =
+-pkgdata_PROGRAMS =
+-pkglib_PROGRAMS =
+-pkglib_SCRIPTS =
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkglib32_PROGRAMS =
+ pkglib32dir = $(lib32dir)/@PACKAGE@
+ pkglib64dir = $(lib64dir)/@PACKAGE@
+diff -up frysk-0.4/frysk-core/Makefile.am.nopkglibdir frysk-0.4/frysk-core/Makefile.am
+--- frysk-0.4/frysk-core/Makefile.am.nopkglibdir	2012-02-11 23:00:39.226000079 -0500
++++ frysk-0.4/frysk-core/Makefile.am	2012-02-11 23:01:40.329995991 -0500
+@@ -70,7 +70,7 @@ GEN_GCJ_LDADD_LIST += -lstdc++
+ GEN_GCJ_LDADD_LIST += -laudit
+ 
+ # For TestExec.java
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias
++noinst_PROGRAMS += frysk/pkglibdir/funit-exec-alias
+ frysk_pkglibdir_funit_exec_alias_SOURCES =
+ frysk/pkglibdir/funit-exec-alias: frysk/pkglibdir/funit-exec
+ 	cp -p frysk/pkglibdir/funit-exec $@
+@@ -79,7 +79,7 @@ frysk/pkglibdir/funit-exec-alias: frysk/
+ frysk_pkglibdir_test1_LDADD = -lm
+ 
+ if DO_ARCH32_TEST
+-pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-exec-alias
++noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-exec-alias
+ frysk_pkglibdir_arch32_funit_exec_alias_SOURCES =
+ frysk/pkglibdir/arch32/funit-exec-alias: frysk/pkglibdir/arch32/funit-exec
+ 	cp -p frysk/pkglibdir/arch32/funit-exec $@
+@@ -103,8 +103,8 @@ frysk/debuginfo/TestTypeFactory.java: fr
+ # of the test program (in particular c++ exceptions).
+ 
+ # funit-stacks
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-noeh
+ frysk_pkglibdir_funit_stacks_nodebug_SOURCES =
+ frysk_pkglibdir_funit_stacks_noeh_SOURCES =
+ frysk/pkglibdir/funit-stacks-nodebug: frysk/pkglibdir/funit-stacks
+@@ -115,8 +115,8 @@ frysk/pkglibdir/funit-stacks-noeh: frysk
+ 		frysk/pkglibdir/funit-stacks $@
+ 
+ # funit-empty-functions
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-empty-functions-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-empty-functions-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-empty-functions-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-empty-functions-noeh
+ frysk_pkglibdir_funit_empty_functions_nodebug_SOURCES =
+ frysk_pkglibdir_funit_empty_functions_noeh_SOURCES =
+ frysk/pkglibdir/funit-empty-functions-nodebug: frysk/pkglibdir/funit-empty-functions
+@@ -127,8 +127,8 @@ frysk/pkglibdir/funit-empty-functions-no
+ 		frysk/pkglibdir/funit-empty-functions $@
+ 
+ # funit-stacks-exit
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-noeh
+ frysk_pkglibdir_funit_stacks_exit_nodebug_SOURCES =
+ frysk_pkglibdir_funit_stacks_exit_noeh_SOURCES =
+ frysk/pkglibdir/funit-stacks-exit-nodebug: frysk/pkglibdir/funit-stacks-exit
+@@ -139,8 +139,8 @@ frysk/pkglibdir/funit-stacks-exit-noeh:
+ 		frysk/pkglibdir/funit-stacks-exit $@
+ 
+ # funit-scopes
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-noeh
+ frysk_pkglibdir_funit_scopes_nodebug_SOURCES =
+ frysk_pkglibdir_funit_scopes_noeh_SOURCES =
+ frysk/pkglibdir/funit-scopes-nodebug: frysk/pkglibdir/funit-scopes
+@@ -151,8 +151,8 @@ frysk/pkglibdir/funit-scopes-noeh: frysk
+ 		frysk/pkglibdir/funit-scopes $@
+ 
+ # funit-scopes-workaround
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-noeh
+ frysk_pkglibdir_funit_scopes_workaround_nodebug_SOURCES =
+ frysk_pkglibdir_funit_scopes_workaround_noeh_SOURCES =
+ frysk/pkglibdir/funit-scopes-workaround-nodebug: frysk/pkglibdir/funit-scopes-workaround
+@@ -163,8 +163,8 @@ frysk/pkglibdir/funit-scopes-workaround-
+ 		frysk/pkglibdir/funit-scopes-workaround $@
+ 
+ # funit-stack-inlined
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-noeh
+ frysk_pkglibdir_funit_stack_inlined_nodebug_SOURCES =
+ frysk_pkglibdir_funit_stack_inlined_noeh_SOURCES =
+ frysk/pkglibdir/funit-stack-inlined-nodebug: frysk/pkglibdir/funit-stack-inlined
+@@ -175,8 +175,8 @@ frysk/pkglibdir/funit-stack-inlined-noeh
+ 		frysk/pkglibdir/funit-stack-inlined $@
+ 
+ # funit-stacks-values
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-values-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-values-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-values-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-values-noeh
+ frysk_pkglibdir_funit_stacks_values_nodebug_SOURCES =
+ frysk_pkglibdir_funit_stacks_values_noeh_SOURCES =
+ frysk/pkglibdir/funit-stacks-values-nodebug: frysk/pkglibdir/funit-stacks-values
+@@ -187,8 +187,8 @@ frysk/pkglibdir/funit-stacks-values-noeh
+ 		frysk/pkglibdir/funit-stacks-values $@
+ 
+ # funit-stacks-linenum
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-noeh
+ frysk_pkglibdir_funit_stacks_linenum_nodebug_SOURCES =
+ frysk_pkglibdir_funit_stacks_linenum_noeh_SOURCES =
+ frysk/pkglibdir/funit-stacks-linenum-nodebug: frysk/pkglibdir/funit-stacks-linenum
+@@ -199,8 +199,8 @@ frysk/pkglibdir/funit-stacks-linenum-noe
+ 		frysk/pkglibdir/funit-stacks-linenum $@
+ 
+ # funit-cpp-scopes-class
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-nodebug
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-noeh
++noinst_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-noeh
+ frysk_pkglibdir_funit_cpp_scopes_class_nodebug_SOURCES =
+ frysk_pkglibdir_funit_cpp_scopes_class_noeh_SOURCES =
+ frysk/pkglibdir/funit-cpp-scopes-class-nodebug: frysk/pkglibdir/funit-cpp-scopes-class
+@@ -213,13 +213,13 @@ frysk/pkglibdir/funit-cpp-scopes-class-n
+ 
+ # Create executables for symbol tests for TestSymbol.java.
+ 
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-symbols-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/funit-symbols-nodebug
+ frysk_pkglibdir_funit_symbols_nodebug_SOURCES =
+ frysk/pkglibdir/funit-symbols-nodebug: frysk/pkglibdir/funit-symbols
+ 	strip --strip-debug -o $@ frysk/pkglibdir/funit-symbols
+ 
+ 
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-symbols-stripped
++noinst_PROGRAMS += frysk/pkglibdir/funit-symbols-stripped
+ frysk_pkglibdir_funit_symbols_stripped_SOURCES =
+ frysk/pkglibdir/funit-symbols-stripped: frysk/pkglibdir/funit-symbols
+ 	strip -o $@ frysk/pkglibdir/funit-symbols
+@@ -268,13 +268,13 @@ uninstall-sysroot-local:
+ 	rm -rf $(pkglib32dir)/test-sysroot
+ 
+ if DO_ARCH32_TEST
+-pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
++noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
+ frysk_pkglibdir_arch32_funit_symbols_nodebug_SOURCES =
+ frysk/pkglibdir/arch32/funit-symbols-nodebug: frysk/pkglibdir/arch32/funit-symbols
+ 	strip --strip-debug -o $@ frysk/pkglibdir/arch32/funit-symbols
+ 
+ 
+-pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-stripped
++noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-stripped
+ frysk_pkglibdir_arch32_funit_symbols_stripped_SOURCES =
+ frysk/pkglibdir/arch32/funit-symbols-stripped: frysk/pkglibdir/arch32/funit-symbols
+ 	strip -o $@ frysk/pkglibdir/arch32/funit-symbols
+@@ -318,7 +318,7 @@ frysk/pkgdatadir/test-core-x86:
+ 	ln -s -f @abs_top_builddir@/../frysk-sys/$@ $@
+ 
+ # The following links two files into one executable
+-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-multi-file
++noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-multi-file
+ frysk_pkglibdir_funit_scopes_multi_file_SOURCES =
+ frysk/pkglibdir/funit-scopes-multi-file:
+ 	gcc -g $(srcdir)/frysk/pkglibdir/funit-scopes-multi-file-a.c  $(srcdir)/frysk/pkglibdir/funit-scopes-multi-file-b.c  -o   frysk/pkglibdir/funit-scopes-multi-file
+diff -up frysk-0.4/frysk-imports/tests/Makefile.am.nopkglibdir frysk-0.4/frysk-imports/tests/Makefile.am
+--- frysk-0.4/frysk-imports/tests/Makefile.am.nopkglibdir	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-imports/tests/Makefile.am	2012-02-11 23:01:46.275993979 -0500
+@@ -42,7 +42,6 @@ AM_CFLAGS = -Werror -Wall -I$(top_srcdir
+ # Gag all the output from the failing tests
+ noinst_PROGRAMS =
+ noinst_SCRIPTS =
+-pkglib_SCRIPTS =
+ TESTS_ENVIRONMENT = eval > /dev/null 2>&1
+ XFAIL_TESTS =
+ PASS_TESTS =
diff --git a/frysk-0.4-sodwfl.patch b/frysk-0.4-sodwfl.patch
index b4198f3..10f5209 100644
--- a/frysk-0.4-sodwfl.patch
+++ b/frysk-0.4-sodwfl.patch
@@ -1,7 +1,7 @@
 diff -up frysk-0.4/frysk-common/Makefile.rules.sodwfl frysk-0.4/frysk-common/Makefile.rules
---- frysk-0.4/frysk-common/Makefile.rules.sodwfl	2010-03-24 19:58:07.000000000 -0400
-+++ frysk-0.4/frysk-common/Makefile.rules	2010-03-24 21:52:51.000000000 -0400
-@@ -164,16 +164,9 @@ AM_CXXFLAGS = \
+--- frysk-0.4/frysk-common/Makefile.rules.sodwfl	2012-02-11 21:37:13.468000053 -0500
++++ frysk-0.4/frysk-common/Makefile.rules	2012-02-11 21:37:13.635000054 -0500
+@@ -160,16 +160,9 @@ AM_CXXFLAGS = \
  	-I$(srcdir) \
  	-I$(srcdir)/../frysk-imports/include \
  	-I$(top_builddir) \
@@ -20,7 +20,7 @@ diff -up frysk-0.4/frysk-common/Makefile.rules.sodwfl frysk-0.4/frysk-common/Mak
  	-fPIC \
  	$(ZZZ)
  
-@@ -399,12 +392,10 @@ Runner:
+@@ -395,12 +388,10 @@ Runner:
  	echo "#!/bin/sh"					>> $@.tmp
  	echo ""	     						>> $@.tmp
  	echo "# some pre-definitions"				>> $@.tmp
@@ -34,8 +34,8 @@ diff -up frysk-0.4/frysk-common/Makefile.rules.sodwfl frysk-0.4/frysk-common/Mak
  	echo ""	     						>> $@.tmp
  	echo "# Set up classpath"				>> $@.tmp
 diff -up frysk-0.4/frysk-core/Makefile.am.sodwfl frysk-0.4/frysk-core/Makefile.am
---- frysk-0.4/frysk-core/Makefile.am.sodwfl	2010-03-24 22:12:26.000000000 -0400
-+++ frysk-0.4/frysk-core/Makefile.am	2010-03-24 22:13:13.000000000 -0400
+--- frysk-0.4/frysk-core/Makefile.am.sodwfl	2012-02-11 21:37:13.469000053 -0500
++++ frysk-0.4/frysk-core/Makefile.am	2012-02-11 21:37:57.412994059 -0500
 @@ -53,11 +53,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
@@ -55,10 +55,10 @@ diff -up frysk-0.4/frysk-core/Makefile.am.sodwfl frysk-0.4/frysk-core/Makefile.a
 +GEN_GCJ_LDADD_LIST += -lasm -ldw -lebl -lelf
  
  # For TestExec.java
- pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias
+ noinst_PROGRAMS += frysk/pkglibdir/funit-exec-alias
 diff -up frysk-0.4/frysk-gtk/Makefile.am.sodwfl frysk-0.4/frysk-gtk/Makefile.am
---- frysk-0.4/frysk-gtk/Makefile.am.sodwfl	2010-03-24 22:15:40.000000000 -0400
-+++ frysk-0.4/frysk-gtk/Makefile.am	2010-03-24 22:16:36.000000000 -0400
+--- frysk-0.4/frysk-gtk/Makefile.am.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-gtk/Makefile.am	2012-02-11 21:37:13.640000054 -0500
 @@ -51,11 +51,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-sys/libfr
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a 
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
@@ -80,8 +80,8 @@ diff -up frysk-0.4/frysk-gtk/Makefile.am.sodwfl frysk-0.4/frysk-gtk/Makefile.am
  # Hack, need to compile this entire sub-tree with JNI.
  AM_GCJFLAGS += -fjni 
 diff -up frysk-0.4/frysk-gui/Makefile.am.sodwfl frysk-0.4/frysk-gui/Makefile.am
---- frysk-0.4/frysk-gui/Makefile.am.sodwfl	2010-03-24 22:15:44.000000000 -0400
-+++ frysk-0.4/frysk-gui/Makefile.am	2010-03-24 22:16:21.000000000 -0400
+--- frysk-0.4/frysk-gui/Makefile.am.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-gui/Makefile.am	2012-02-11 21:37:13.641000054 -0500
 @@ -60,11 +60,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a 
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a 
@@ -104,7 +104,7 @@ diff -up frysk-0.4/frysk-gui/Makefile.am.sodwfl frysk-0.4/frysk-gui/Makefile.am
  #TESTS_ENVIRONMENT = ( test $$tst != TestRunner || test -n "$$DISPLAY" || exit 77 ) && 
 diff -up frysk-0.4/frysk-imports/bootstrap.sh.sodwfl frysk-0.4/frysk-imports/bootstrap.sh
 --- frysk-0.4/frysk-imports/bootstrap.sh.sodwfl	2008-06-09 14:03:07.000000000 -0400
-+++ frysk-0.4/frysk-imports/bootstrap.sh	2010-03-24 19:58:07.000000000 -0400
++++ frysk-0.4/frysk-imports/bootstrap.sh	2012-02-11 21:37:13.642000054 -0500
 @@ -51,18 +51,6 @@ FILE_LIST="\
  ./common/Makefile.gen.sh $FILE_LIST
  
@@ -126,7 +126,7 @@ diff -up frysk-0.4/frysk-imports/bootstrap.sh.sodwfl frysk-0.4/frysk-imports/boo
      autoconf -Werror -f
 diff -up frysk-0.4/frysk-imports/configure.ac.sodwfl frysk-0.4/frysk-imports/configure.ac
 --- frysk-0.4/frysk-imports/configure.ac.sodwfl	2008-06-09 14:03:07.000000000 -0400
-+++ frysk-0.4/frysk-imports/configure.ac	2010-03-24 19:58:07.000000000 -0400
++++ frysk-0.4/frysk-imports/configure.ac	2012-02-11 21:37:13.643000054 -0500
 @@ -61,6 +61,6 @@ AC_CONFIG_FILES([
  # list of configured subdirectories so that it can be included in
  # "make dist" (or the recursive "make distdir").
@@ -137,7 +137,7 @@ diff -up frysk-0.4/frysk-imports/configure.ac.sodwfl frysk-0.4/frysk-imports/con
  AC_OUTPUT
 diff -up frysk-0.4/frysk-imports/Makefile.am.sodwfl frysk-0.4/frysk-imports/Makefile.am
 --- frysk-0.4/frysk-imports/Makefile.am.sodwfl	2008-06-09 14:03:07.000000000 -0400
-+++ frysk-0.4/frysk-imports/Makefile.am	2010-03-24 19:58:07.000000000 -0400
++++ frysk-0.4/frysk-imports/Makefile.am	2012-02-11 21:37:13.655000049 -0500
 @@ -58,7 +58,6 @@ LIBUNWIND_ARCH_DIRS = libunwind-i386 lib
  CHECK_SUBDIRS = \
  	jline \
@@ -159,9 +159,9 @@ diff -up frysk-0.4/frysk-imports/Makefile.am.sodwfl frysk-0.4/frysk-imports/Make
  GEN_GCJ_LDADD_LIST += ./libunwind-i386/src/.libs/libunwind-x86.a
  GEN_GCJ_LDADD_LIST += ./libunwind-x86_64/src/.libs/libunwind-x86_64.a
 diff -up frysk-0.4/frysk-imports/tests/Makefile.am.sodwfl frysk-0.4/frysk-imports/tests/Makefile.am
---- frysk-0.4/frysk-imports/tests/Makefile.am.sodwfl	2008-06-09 14:03:07.000000000 -0400
-+++ frysk-0.4/frysk-imports/tests/Makefile.am	2010-03-24 19:58:07.000000000 -0400
-@@ -463,7 +463,6 @@ systests_PASS_PROGRAM += frysk4217/attac
+--- frysk-0.4/frysk-imports/tests/Makefile.am.sodwfl	2012-02-11 21:37:13.470000053 -0500
++++ frysk-0.4/frysk-imports/tests/Makefile.am	2012-02-11 21:37:13.671000057 -0500
+@@ -462,7 +462,6 @@ systests_PASS_PROGRAM += frysk4217/attac
  systests_PASS_PROGRAM += frysk4330/stopkills
  
  # test if /proc/PID/maps has r-xp permissions for the VDSO entry
@@ -169,7 +169,7 @@ diff -up frysk-0.4/frysk-imports/tests/Makefile.am.sodwfl frysk-0.4/frysk-import
  systests_PASS_PROGRAM += frysk4704/vdso-permissions
  
  # A final variable/inner class test.
-@@ -486,10 +485,6 @@ frysk4742/java.sh:
+@@ -485,10 +484,6 @@ frysk4742/java.sh:
  		\| grep Referee > $@
  	chmod a+x $@
  
@@ -183,8 +183,8 @@ diff -up frysk-0.4/frysk-imports/tests/Makefile.am.sodwfl frysk-0.4/frysk-import
 +frysk4796_dwfltest_CFLAGS = -I/usr/include/elfutils
  systests_PASS_PROGRAM += frysk4796/dwfltest
 diff -up frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx.sodwfl frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx
---- frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx.sodwfl	2010-03-24 21:49:32.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx	2010-03-24 21:49:53.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx.sodwfl	2012-02-11 21:37:12.987000054 -0500
++++ frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx	2012-02-11 21:37:13.676000052 -0500
 @@ -36,9 +36,10 @@
  // modification, you must delete this exception statement from your
  // version and license this file solely under the GPL without
@@ -199,8 +199,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/cni/DwarfDie.cxx.sodwfl frysk-0.4/frysk-sy
  #include <alloca.h>
  #include <stdlib.h>
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum.sodwfl	2010-03-24 20:13:34.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum	2010-03-24 22:08:31.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum	2012-02-11 21:37:13.678000052 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -211,8 +211,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAccess.shenum.sodwfl frysk-0.4/frysk-sys
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum.sodwfl	2010-03-24 20:14:07.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum	2010-03-24 20:14:22.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum	2012-02-11 21:37:13.679000052 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -223,8 +223,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAte.shenum.sodwfl frysk-0.4/frysk-sys/li
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum.sodwfl	2010-03-24 20:11:25.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum	2010-03-24 20:11:49.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum	2012-02-11 21:37:13.680000052 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -235,8 +235,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwAt.shenum.sodwfl frysk-0.4/frysk-sys/lib
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum.sodwfl	2010-03-24 20:17:00.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum	2010-03-24 20:17:24.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum	2012-02-11 21:37:13.681000052 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -247,8 +247,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwDsc.shenum.sodwfl frysk-0.4/frysk-sys/li
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum.sodwfl	2010-03-24 20:16:10.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum	2010-03-24 20:16:28.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum	2012-02-11 21:37:13.682000052 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -259,8 +259,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwDs.shenum.sodwfl frysk-0.4/frysk-sys/lib
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum.sodwfl	2010-03-24 20:18:38.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum	2010-03-24 20:18:53.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum	2012-02-11 21:37:13.697000054 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -271,8 +271,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwEnd.shenum.sodwfl frysk-0.4/frysk-sys/li
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum.sodwfl	2010-03-24 20:08:28.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum	2010-03-24 20:09:47.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum	2012-02-11 21:37:13.698000054 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -283,8 +283,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwInl.shenum.sodwfl frysk-0.4/frysk-sys/li
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum.sodwfl	2010-03-24 20:17:35.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum	2010-03-24 20:23:06.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum	2012-02-11 21:37:13.699000054 -0500
 @@ -42,7 +42,8 @@
  # in.
  
@@ -296,8 +296,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwOp.shenum.sodwfl frysk-0.4/frysk-sys/lib
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum.sodwfl	2010-03-24 20:15:46.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum	2010-03-24 20:15:59.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum	2012-02-11 21:37:13.700000054 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -308,8 +308,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwOrd.shenum.sodwfl frysk-0.4/frysk-sys/li
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum.sodwfl frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum
---- frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum.sodwfl	2010-03-24 20:11:19.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum	2010-03-24 20:12:11.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum.sodwfl	2008-06-09 14:03:07.000000000 -0400
++++ frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum	2012-02-11 21:37:13.702000054 -0500
 @@ -42,7 +42,7 @@
  # in.
  
@@ -320,8 +320,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/DwTag.shenum.sodwfl frysk-0.4/frysk-sys/li
  	p = $1
  	v = gensub(",","","",$3)
 diff -up frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx.sodwfl frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
---- frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx.sodwfl	2010-03-24 21:45:24.000000000 -0400
-+++ frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx	2010-03-24 21:46:01.000000000 -0400
+--- frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx.sodwfl	2012-02-11 21:37:12.989000054 -0500
++++ frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx	2012-02-11 21:37:13.703000054 -0500
 @@ -40,8 +40,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -334,8 +334,8 @@ diff -up frysk-0.4/frysk-sys/lib/dwfl/jni/DwarfDie.cxx.sodwfl frysk-0.4/frysk-sy
  #include "jni.hxx"
  
 diff -up frysk-0.4/frysk-sys/Makefile.am.sodwfl frysk-0.4/frysk-sys/Makefile.am
---- frysk-0.4/frysk-sys/Makefile.am.sodwfl	2010-03-24 20:04:31.000000000 -0400
-+++ frysk-0.4/frysk-sys/Makefile.am	2010-03-24 21:56:41.000000000 -0400
+--- frysk-0.4/frysk-sys/Makefile.am.sodwfl	2012-02-11 21:37:12.939000054 -0500
++++ frysk-0.4/frysk-sys/Makefile.am	2012-02-11 21:37:13.704000054 -0500
 @@ -53,11 +53,6 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
  GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
diff --git a/frysk.spec b/frysk.spec
index 01268b3..a60f602 100644
--- a/frysk.spec
+++ b/frysk.spec
@@ -1,7 +1,11 @@
 Summary:	Execution analysis and debugging tool-suite.
 Name:		frysk
 Version:	0.4
-Release:	33%{?dist}
+Release:	35%{?dist}
+
+# Fedora 17+ doesn't have libvte et.al.
+%define enable_gnome %{fedora}0 < 170
+%define enable_devel %{fedora}0 < 170
 
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # getopt is GPLv2 with exception
@@ -38,8 +42,12 @@ Patch15:	frysk-0.4-skipdecl.patch
 Patch16:	frysk-0.4-flushstat.patch
 Patch17:	frysk-0.4-ftrace.patch
 Patch18:	frysk-0.4-usererrno.patch
+Patch19:	frysk-0.4-configure-enable-gnome.patch
+Patch20:	frysk-0.4-bin-antlr.patch
+Patch21:	frysk-0.4-nopkglibdir.patch
 
 Patch100:	frysk-0.4-aclocaljavac.patch
+Patch101:	frysk-0.4-cxx-scope.patch
 
 # Do not push these upstream
 Patch1003:	frysk-0.4-nogtkwerror.patch
@@ -61,21 +69,12 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gcc-java >= 4.1.2
 BuildRequires:	junit >= 3.8.1
+BuildRequires:  jre >= 1.7.0
 BuildRequires:  antlr >= 2.7.4 
 BuildRequires:	jdom >= 1.0
-BuildRequires:	glib-java >= 0.2.6
-BuildRequires:  libgtk-java-devel >= 2.8.7-6
-BuildRequires:	libglade-java-devel >= 2.12.3
-BuildRequires:  cairo-java-devel >= 1.0.3
-BuildRequires:  cairo-devel >= 1.0.0
-BuildRequires:  gtk2-devel >= 2.8.0
-BuildRequires:	libglade2-devel >= 2.5.1
-BuildRequires:	libvte-java-devel >= 0.12.0
-BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
 BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
-BuildRequires:	gnome-python2-gconf
 BuildRequires:	audit-libs-devel
 BuildRequires:	autoconf automake libtool
 BuildRequires:	bison >= 1.875
@@ -85,10 +84,26 @@ BuildRequires:	bzip2-devel
 BuildRequires:	xz-devel
 # Some generation scripts are being written in python
 BuildRequires:	python
+
+# Fedora 15+'s elfutils is usable.
 %if %{fedora}0 >= 150
 BuildRequires:	elfutils-devel >= 0.151
 %endif
 
+%if %{enable_gnome}
+BuildRequires:	glib-java >= 0.2.6
+BuildRequires:  cairo-java-devel >= 1.0.3
+BuildRequires:  cairo-devel >= 1.0.0
+BuildRequires:  gtk2-devel >= 2.8.0
+BuildRequires:  libgtk-java-devel >= 2.8.7-6
+BuildRequires:	libvte-java-devel >= 0.12.0
+BuildRequires:	libglade-java-devel >= 2.12.3
+BuildRequires:	libglade2-devel >= 2.5.1
+BuildRequires:  vte-devel >= 0.12.1
+BuildRequires:	gnome-python2-gconf
+%endif
+
+
 # Bug #305611: PPC Build problems with libunwind
 # Bug #416961: ALPHA not supported by frysk and libunwind.
 # Bug #467970: SPARC/SPARC64 not supported by frysk and libunwind.
@@ -112,15 +127,20 @@ running processes and threads, of locking primitives and will also
 expose deadlocks, gather data and debug any given process in the
 system.
 
+%if %{enable_devel}
 %package devel
 Summary:        The development part of Frysk
 Group:		Development/System
 Requires:       %{name} = %{version}-%{release}
+%endif
+%if %{enable_gnome}
 Requires:	dogtail >= 0.5.2
 # Needed by "dogtail-run-headless -n":
 Requires:	metacity
 Requires:	python
+%endif
 
+%if %{enable_devel}
 %description devel
 Frysk is an execution-analysis technology implemented using native
 Java and C++.  It is aimed at providing developers and sysadmins with
@@ -131,7 +151,9 @@ expose deadlocks, gather data and debug any given process in the
 system.
 
 This package contains the development components of Frysk.
+%endif
 
+%if %{enable_gnome}
 %package gnome
 Summary:        The GNOME front-end of Frysk
 Requires:       %{name} = %{version}-%{release}
@@ -150,6 +172,7 @@ expose deadlocks, gather data and debug any given process in the
 system.
 
 This package contains the GNOME front end for Frysk.
+%endif
 
 %prep
 
@@ -178,11 +201,25 @@ mv frysk-core/frysk/util/ProcStopUtil.java frysk-core/frysk/util/TaskStopUtil.ja
 %patch16 -p1 -z .flushstat
 %patch17 -p1 -z .ftrace
 %patch18 -p1 -z .usererrno
+%patch19 -p1 -z .configure-enable-gnome
+%patch20 -p1 -z .bin-antlr
 
 %if %{fedora}0 >= 130
 %patch100 -p1 -z .aclocaljavac
 %endif
 
+%if %{enable_gnome}
+# don't apply - leaves default as build gnome
+%else
+%patch101 -p1 -z .configure-enable-gnome
+%endif
+
+%if %{enable_devel}
+# don't apply - leaves devel package installed
+%else
+%patch21 -p1 -z .nopkglibdir
+%endif
+
 %patch1003 -p1 -z .nogtkwerror
 
 %if %{fedora}0 >= 150
@@ -243,6 +280,7 @@ pwd
 cd build
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
+%if %{enable_gnome}
 # Fix timestamp of a generated script:
 touch -r \
       ../frysk-gui/frysk/gui/FryskGui.java-in \
@@ -253,22 +291,34 @@ for f in test2866.py test2985.py test3380.py; do
     	  ../frysk-gui/frysk/gui/test/dogtail_scripts/$f \
 	  $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/$f
 done
+%endif
 
 # Workaround for #211824:
 rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar
 
 # some stray files.
+%if %{enable_devel}
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/gen-type-funit-tests
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/ChangeLog
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/test-exe-x86.c.source
+%else
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libfrysk-junit.so
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man8
+%endif
 
 # We are not yet ready to be in the menu:
+%if %{enable_gnome}
 echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
+%endif
 
+%if %{enable_devel}
 # Remove duplicates; causes tools to complain.
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-exec-alias
 # Remove debuginfo; confuses elfutils.
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug
+%endif
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -304,13 +354,6 @@ rm -rf %{buildroot}
 %{_libdir}/libfrysk-jdom.so
 %{_libdir}/libfrysk-jline.so
 
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/messages.properties
-%{_datadir}/%{name}/test-core-x86
-%{_datadir}/%{name}/test-core-x8664
-%{_datadir}/%{name}/test-exe-x86
-%{_datadir}/%{name}/libtest.so
-
 %{_mandir}/man1/fauxv.1.gz
 %{_mandir}/man1/fcatch.1.gz
 %{_mandir}/man1/fcore.1.gz
@@ -326,6 +369,7 @@ rm -rf %{buildroot}
 %{_mandir}/man1/ftrace.1.gz
 %{_mandir}/man7/frysk.7.gz
 
+%if %{enable_devel}
 %files devel
 
 %defattr(-,root,root)
@@ -335,7 +379,6 @@ rm -rf %{buildroot}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/FunitSimpleInterfaceMain
 %{_libdir}/%{name}/fsystest
-%{_libdir}/%{name}/ftail
 %{_libdir}/%{name}/funit*
 %{_libdir}/%{name}/hpd-c
 %{_libdir}/%{name}/sys-tests
@@ -343,9 +386,20 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/test1
 %{_datadir}/%{name}/helloworld.o
 %{_datadir}/%{name}/test_looper.xml
-%{_datadir}/%{name}/dogtail_scripts
-%{_mandir}/man8/*
+%{_datadir}/%{name}/test-core-x86
+%{_datadir}/%{name}/test-core-x8664
+%{_datadir}/%{name}/test-exe-x86
+%{_datadir}/%{name}/libtest.so
 
+%{_mandir}/man8/*
+%endif
+
+%if %{enable_gnome}
+%{_libdir}/%{name}/ftail
+%{_datadir}/%{name}/dogtail_scripts
+%endif
+
+%if %{enable_gnome}
 %files gnome
 
 %defattr(-,root,root)
@@ -361,6 +415,7 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/glade
 %{_datadir}/%{name}/images
 
+%{_datadir}/%{name}/messages.properties
 %{_datadir}/applications/frysk.desktop
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
@@ -369,7 +424,17 @@ rm -rf %{buildroot}
 
 %{_mandir}/man1/frysk.1.gz
 
+%endif
+
 %changelog
+* Sat Feb 11 2012 Andrew Cagney <cagney@fedoraproject.org> - 0.4-35
+- Clean up pkglibdir and pkglibdata dir, devel package not needed.
+
+* Sat Jan 21 2012 Andrew Cagney <cagney@fedoraproject.org> - 0.4-34
+- Add frysk-0.4-configure-enable-gnome.patch as no vte/java bindings.
+- Use installed antlr - frysk-0.4-bin-antlr.patch
+- Fix scope warning from latest c++ - frysk-04-cxx-scope.patch
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild