rpms/frysk/devel frysk-0.4-aclocaljavac.patch, NONE, 1.1 frysk-0.4-elfutilsdeps.patch, NONE, 1.1 frysk-0.4-elfutilsfstat.patch, NONE, 1.1 frysk-0.4-mktlwidgetdir.patch, NONE, 1.1 frysk.spec, 1.151, 1.152

Wed Mar 17 18:36:19 UTC 2010

Author: cagney

Update of /cvs/pkgs/rpms/frysk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16738/devel

Modified Files:
	frysk.spec 
Added Files:
	frysk-0.4-aclocaljavac.patch frysk-0.4-elfutilsdeps.patch 
	frysk-0.4-elfutilsfstat.patch frysk-0.4-mktlwidgetdir.patch 
Log Message:
* Wed Mar 17 2010 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-14
- Update to latest autotools - frysk-0.4-aclocaljavac.patch,
  frysk-0.4-elfutilsdeps.patch
- Add missing include sys/stat.h - frysk-0.4-elfutilsfstat.patch
- Create missing dir - frysk-0.4-mktlwidgetdir.patch


frysk-0.4-aclocaljavac.patch:
 frysk-common.ac |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE frysk-0.4-aclocaljavac.patch ---
diff -up frysk-0.4/frysk-common/frysk-common.ac.aclocaljavac frysk-0.4/frysk-common/frysk-common.ac
--- frysk-0.4/frysk-common/frysk-common.ac.aclocaljavac	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-common/frysk-common.ac	2010-03-16 14:41:28.000000000 -0400
@@ -115,15 +115,15 @@ AC_MSG_RESULT(${ECJ_JAR})
 
 # autoconf doesn't yet know about JAVAC, so define it ourselves.
 
-m4_define([AC_LANG(JAVAC)],
+AC_LANG_DEFINE([Java], [java], [JAVA], [JAVAC], [],
 [ac_ext=java
 ac_objext=class
 ac_compile='$JAVAC $JAVACFLAGS conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
 ac_java_werror_flag=no
 ])
-m4_defun([AC_LANG_COMPILER(JAVAC)], [])
-m4_define([_AC_LANG_ABBREV(JAVAC)], [java])
-AC_LANG(JAVAC)
+AC_DEFUN([AC_LANG_COMPILER(Java)], [])
+AU_DEFUN([AC_LANG_JAVAC], [AC_LANG(Java)])
+AC_LANG(Java)
 
 
 # Two possible compilers: either GCJ (wrapper round ECJ); or ECJ.  In

frysk-0.4-elfutilsdeps.patch:
 backends/Makefile.am |    5 +++++
 libasm/Makefile.am   |    5 +++++
 libdw/Makefile.am    |    5 +++++
 libdwfl/Makefile.am  |    5 +++++
 libebl/Makefile.am   |    5 +++++
 libelf/Makefile.am   |    5 +++++
 src/Makefile.am      |    5 +++++
 7 files changed, 35 insertions(+)

--- NEW FILE frysk-0.4-elfutilsdeps.patch ---
diff -up frysk-0.4/frysk-imports/elfutils/libelf/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libelf/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
diff -up frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/backends/Makefile.am
--- frysk-0.4/frysk-imports/elfutils/backends/Makefile.am.elfutilsdeps	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/backends/Makefile.am	2010-03-16 16:19:30.000000000 -0400
@@ -125,11 +125,16 @@ libebl_%.map: Makefile
 	echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' > $@
 
 %.os: %.c
+if AMDEP
 	if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
 	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
+else
+	$(COMPILE) -c -o $@ -fpic -DPIC -DSHARED \
+		`test -f '$<' || echo '$(srcdir)/'`$<
+endif
 
 install: install-am install-ebl-modules
 install-ebl-modules:
diff -up frysk-0.4/frysk-imports/elfutils/libasm/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libasm/Makefile.am
--- frysk-0.4/frysk-imports/elfutils/libasm/Makefile.am.elfutilsdeps	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/libasm/Makefile.am	2010-03-16 16:32:59.000000000 -0400
@@ -76,12 +76,17 @@ libasm.so: libasm_pic.a libasm.map
 
 
 %.os: %.c %.o
+if AMDEP
 	if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
 	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
 	     rm -f "$(DEPDIR)/$*.Tpo"; \
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
+else
+	$(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED \
+	  `test -f '$<' || echo '$(srcdir)/'`$<
+endif
 
 install: install-am libasm.so
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
diff -up frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am
--- frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am.elfutilsdeps	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/libdwfl/Makefile.am	2010-03-16 16:19:30.000000000 -0400
@@ -93,12 +93,17 @@ libdwfl_pic_a_SOURCES =
 am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os)
 
 %.os: %.c %.o
+if AMDEP
 	if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
 	   -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
 	     rm -f "$(DEPDIR)/$*.Tpo"; \
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
+else
+	$(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED \
+		`test -f '$<' || echo '$(srcdir)/'`$<
+endif
 endif
 
 noinst_HEADERS = libdwflP.h
diff -up frysk-0.4/frysk-imports/elfutils/libdw/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libdw/Makefile.am
--- frysk-0.4/frysk-imports/elfutils/libdw/Makefile.am.elfutilsdeps	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/libdw/Makefile.am	2010-03-16 16:19:30.000000000 -0400
@@ -104,12 +104,17 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.
 	ln -fs $@ $@.$(VERSION)
 
 %.os: %.c %.o
+if AMDEP
 	if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
 	   -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
 	     rm -f "$(DEPDIR)/$*.Tpo"; \
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
+else
+	$(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED \
+		`test -f '$<' || echo '$(srcdir)/'`$<
+endif
 
 install: install-am libdw.so
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
diff -up frysk-0.4/frysk-imports/elfutils/libebl/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libebl/Makefile.am
--- frysk-0.4/frysk-imports/elfutils/libebl/Makefile.am.elfutilsdeps	2010-03-16 16:20:25.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/libebl/Makefile.am	2010-03-16 16:21:11.000000000 -0400
@@ -64,12 +64,17 @@ libebl_a_SOURCES = $(gen_SOURCES)
 
 
 %.os: %.c %.o
+if AMDEP
 	if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
 	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
 	     rm -f "$(DEPDIR)/$*.Tpo"; \
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
+else
+	if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED \
+	  `test -f '$<' || echo '$(srcdir)/'`$<
+endif
 
 noinst_HEADERS = libeblP.h ebl-hooks.h
 
diff -up frysk-0.4/frysk-imports/elfutils/libelf/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/libelf/Makefile.am
--- frysk-0.4/frysk-imports/elfutils/libelf/Makefile.am.elfutilsdeps	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/libelf/Makefile.am	2010-03-16 16:34:11.000000000 -0400
@@ -114,12 +114,17 @@ libelf.so: libelf_pic.a libelf.map
 	ln -fs $@ $@.$(VERSION)
 
 %.os: %.c %.o
+if AMDEP
 	if $(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
 	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
 	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
 	     rm -f "$(DEPDIR)/$*.Tpo"; \
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
+else
+	$(COMPILE.os) -c -o $@ -fpic -DPIC -DSHARED \
+		`test -f '$<' || echo '$(srcdir)/'`$<
+endif
 
 install: install-am libelf.so
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
diff -up frysk-0.4/frysk-imports/elfutils/src/Makefile.am.elfutilsdeps frysk-0.4/frysk-imports/elfutils/src/Makefile.am
--- frysk-0.4/frysk-imports/elfutils/src/Makefile.am.elfutilsdeps	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/src/Makefile.am	2010-03-16 16:19:30.000000000 -0400
@@ -153,6 +153,7 @@ endif
 
 
 %.os: %.c %.o
+if AMDEP
 	if $(filter-out -fmudflap,$(COMPILE)) -c -o $@ -fpic -DPIC -DSHARED \
 	  -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
 	  `test -f '$<' || echo '$(srcdir)/'`$<; \
@@ -160,6 +161,10 @@ endif
 	     rm -f "$(DEPDIR)/$*.Tpo"; \
 	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
 	fi
+else
+	$(filter-out -fmudflap,$(COMPILE)) -c -o $@ -fpic -DPIC -DSHARED \
+	  `test -f '$<' || echo '$(srcdir)/'`$<
+endif
 
 # Special rule to make it possible to define libld_elf_a_SOURCES as we do.
 # Otherwise make would complain.

frysk-0.4-elfutilsfstat.patch:
 ar.c      |    1 +
 elflint.c |    1 +
 readelf.c |    1 +
 strip.c   |    1 +
 unstrip.c |    1 +
 5 files changed, 5 insertions(+)

--- NEW FILE frysk-0.4-elfutilsfstat.patch ---
diff -up frysk-0.4/frysk-imports/elfutils/src/ar.c.elfutilsfstat frysk-0.4/frysk-imports/elfutils/src/ar.c
--- frysk-0.4/frysk-imports/elfutils/src/ar.c.elfutilsfstat	2010-03-16 18:21:52.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/src/ar.c	2010-03-16 18:22:14.000000000 -0400
@@ -47,6 +47,7 @@
 #include <sys/mman.h>
 #include <sys/statfs.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 
 #include <system.h>
 
diff -up frysk-0.4/frysk-imports/elfutils/src/elflint.c.elfutilsfstat frysk-0.4/frysk-imports/elfutils/src/elflint.c
--- frysk-0.4/frysk-imports/elfutils/src/elflint.c.elfutilsfstat	2010-03-16 17:10:51.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/src/elflint.c	2010-03-16 17:11:13.000000000 -0400
@@ -43,6 +43,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
+#include <sys/stat.h>
 
 #include <elf-knowledge.h>
 #include <system.h>
diff -up frysk-0.4/frysk-imports/elfutils/src/readelf.c.elfutilsfstat frysk-0.4/frysk-imports/elfutils/src/readelf.c
--- frysk-0.4/frysk-imports/elfutils/src/readelf.c.elfutilsfstat	2010-03-16 16:59:12.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/src/readelf.c	2010-03-16 16:59:24.000000000 -0400
@@ -49,6 +49,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/param.h>
+#include <sys/stat.h>
 
 #include <system.h>
 #include "../libelf/libelfP.h"
diff -up frysk-0.4/frysk-imports/elfutils/src/strip.c.elfutilsfstat frysk-0.4/frysk-imports/elfutils/src/strip.c
--- frysk-0.4/frysk-imports/elfutils/src/strip.c.elfutilsfstat	2010-03-16 17:02:37.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/src/strip.c	2010-03-16 17:02:55.000000000 -0400
@@ -47,6 +47,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 
 #include <elf-knowledge.h>
 #include <libebl.h>
diff -up frysk-0.4/frysk-imports/elfutils/src/unstrip.c.elfutilsfstat frysk-0.4/frysk-imports/elfutils/src/unstrip.c
--- frysk-0.4/frysk-imports/elfutils/src/unstrip.c.elfutilsfstat	2010-03-16 18:38:13.000000000 -0400
+++ frysk-0.4/frysk-imports/elfutils/src/unstrip.c	2010-03-16 18:39:04.000000000 -0400
@@ -52,6 +52,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include <gelf.h>
 #include <libebl.h>

frysk-0.4-mktlwidgetdir.patch:
 Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE frysk-0.4-mktlwidgetdir.patch ---
diff -up frysk-0.4/frysk-gtk/tlwidgets/Makefile.am.mktlwidgetdir frysk-0.4/frysk-gtk/tlwidgets/Makefile.am
--- frysk-0.4/frysk-gtk/tlwidgets/Makefile.am.mktlwidgetdir	2010-03-16 19:27:18.000000000 -0400
+++ frysk-0.4/frysk-gtk/tlwidgets/Makefile.am	2010-03-16 19:27:47.000000000 -0400
@@ -180,9 +180,11 @@ BUILT_SOURCES = src/widgets/ftk_marshall
 GENMARSHAL_COMMAND = glib-genmarshal --prefix=_ftk_marshal
 
 .list.h:
+	mkdir -p `dirname $@`
 	$(GENMARSHAL_COMMAND) --header $< >$@
 
 .list.c:
+	mkdir -p `dirname $@`
 	(echo '/* This file has been automatically generated.  Do not edit. */' && \
 	echo '#include "$*.h"' && \
 	$(GENMARSHAL_COMMAND) --body $< ) >$@


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- frysk.spec	15 Mar 2010 20:28:57 -0000	1.151
+++ frysk.spec	17 Mar 2010 18:36:19 -0000	1.152
@@ -1,7 +1,7 @@
 Summary:	Execution analysis and debugging tool-suite.
 Name:		frysk
 Version:	0.4
-Release:	13%{?dist}
+Release:	14%{?dist}
 
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # getopt is GPLv2 with exception
@@ -19,6 +19,10 @@ Patch1:		frysk-0.4-bash-dollar-star.patc
 Patch2:		frysk-0.4-gcc-warnings.patch
 Patch3:		frysk-0.4-fix-duplicates.patch
 Patch4:		frysk-0.4-fdebugrpm.patch
+Patch5:		frysk-0.4-aclocaljavac.patch
+Patch6:		frysk-0.4-elfutilsdeps.patch
+Patch7:		frysk-0.4-elfutilsfstat.patch
+Patch8:		frysk-0.4-mktlwidgetdir.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -115,6 +119,12 @@ pwd
 mv frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
 %patch3 -p1 -z .fix-duplicates
 %patch4 -p1 -z .fdebugrpm
+%if %{fedora}0 >= 130
+%patch5 -p1 -z .aclocaljavac
+%endif
+%patch6 -p1 -z .elfutilsdeps
+%patch7 -p1 -z .elfutilsdeps
+%patch8 -p1 -z .mktlwidgetdir
 ./bootstrap.sh
 
 %build 
@@ -282,6 +292,12 @@ rm -rf %{buildroot}
 %{_mandir}/man1/frysk.1.gz
 
 %changelog
+* Wed Mar 17 2010 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-14
+- Update to latest autotools - frysk-0.4-aclocaljavac.patch,
+  frysk-0.4-elfutilsdeps.patch
+- Add missing include sys/stat.h - frysk-0.4-elfutilsfstat.patch
+- Create missing dir - frysk-0.4-mktlwidgetdir.patch
+
 * Mon Mar 15 2010 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-13
 - Fix debuginforpm's sed line (from  Stephen Tweedie).
 

