From 37486b6ae1950b1f6a24b4eacbd0336c59651e9d Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Feb 12 2012 15:05:32 +0000 Subject: Clean up pkglibdir and pkglibdata dir, devel package not needed. --- 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 f47ec5e..d935d44 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ # Make mock usable. The only standard target is mockbuild which # doesn't do what you typically want. +BRANCH := $(shell git branch | sed -e 's/^\* f*//' -e 's/master/devel/' ) #MOCKCFG = fedora-devel-x86_64 -MOCKCFG = fedora-devel-i386 +MOCKCFG = fedora-$(BRANCH)-i386 # Order that dependent libraries need to be built and installed. @@ -89,9 +90,15 @@ world gnome: .PHONY:: world usable: init - $(MOCK) install vi less emacs + $(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-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 < /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 #include 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 #include @@ -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 760e665..a60f602 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,10 +1,11 @@ Summary: Execution analysis and debugging tool-suite. Name: frysk Version: 0.4 -Release: 34%{?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 @@ -43,6 +44,7 @@ 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 @@ -125,10 +127,12 @@ 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": @@ -136,6 +140,7 @@ 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 @@ -146,6 +151,7 @@ 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 @@ -208,6 +214,12 @@ mv frysk-core/frysk/util/ProcStopUtil.java frysk-core/frysk/util/TaskStopUtil.ja %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 @@ -285,19 +297,28 @@ done 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 @@ -333,12 +354,6 @@ rm -rf %{buildroot} %{_libdir}/libfrysk-jdom.so %{_libdir}/libfrysk-jline.so -%dir %{_datadir}/%{name} -%{_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 @@ -354,6 +369,7 @@ rm -rf %{buildroot} %{_mandir}/man1/ftrace.1.gz %{_mandir}/man7/frysk.7.gz +%if %{enable_devel} %files devel %defattr(-,root,root) @@ -370,8 +386,13 @@ rm -rf %{buildroot} %{_libdir}/%{name}/test1 %{_datadir}/%{name}/helloworld.o %{_datadir}/%{name}/test_looper.xml +%{_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 @@ -406,6 +427,9 @@ rm -rf %{buildroot} %endif %changelog +* Sat Feb 11 2012 Andrew Cagney - 0.4-35 +- Clean up pkglibdir and pkglibdata dir, devel package not needed. + * Sat Jan 21 2012 Andrew Cagney - 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