rpms/frysk/F-13 frysk-0.4-funitexitman.patch, NONE, 1.1 frysk-0.4-mvtesttomain.patch, NONE, 1.1 frysk-0.4-nogtkwerror.patch, NONE, 1.1 frysk-0.4-strayelsif.patch, NONE, 1.1 frysk-0.4-gcc-warnings.patch, 1.1, 1.2 frysk.spec, 1.153, 1.154 frysk-0.4-fix-duplicates.patch, 1.1, NONE

Wed Mar 24 17:42:03 UTC 2010

Author: cagney

Update of /cvs/pkgs/rpms/frysk/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4239/F-13

Modified Files:
	frysk-0.4-gcc-warnings.patch frysk.spec 
Added Files:
	frysk-0.4-funitexitman.patch frysk-0.4-mvtesttomain.patch 
	frysk-0.4-nogtkwerror.patch frysk-0.4-strayelsif.patch 
Removed Files:
	frysk-0.4-fix-duplicates.patch 
Log Message:
* Wed Mar 24 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-16
- Re-organize local patches, blat the version.


frysk-0.4-funitexitman.patch:
 funit-exit.xml-in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE frysk-0.4-funitexitman.patch ---
diff -up frysk-0.4/frysk-core/frysk/pkglibdir/funit-exit.xml-in.fix-duplicates frysk-0.4/frysk-core/frysk/pkglibdir/funit-exit.xml-in
--- frysk-0.4/frysk-core/frysk/pkglibdir/funit-exit.xml-in.fix-duplicates	2009-06-19 15:49:54.000000000 -0400
+++ frysk-0.4/frysk-core/frysk/pkglibdir/funit-exit.xml-in	2009-06-19 15:50:12.000000000 -0400
@@ -47,7 +47,7 @@
  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
  [
  <!ENTITY version SYSTEM "@abs_root_srcdir@/common/version.in">
- <!ENTITY command "funit-threads">
+ <!ENTITY command "funit-exit">
  <!ENTITY volume "8">
  ]
 >

frysk-0.4-mvtesttomain.patch:
 Makefile.am                                   |    6 ------
 frysk/debuginfo/TestGccInterface.java         |    2 +-
 frysk/pkglibdir/FunitSimpleInterface.java     |    2 ++
 frysk/pkglibdir/FunitSimpleInterfaceMain.java |    6 ++++--
 4 files changed, 7 insertions(+), 9 deletions(-)

--- NEW FILE frysk-0.4-mvtesttomain.patch ---
diff -up frysk-0.4/frysk-core/frysk/debuginfo/TestGccInterface.java.fix-duplicates frysk-0.4/frysk-core/frysk/debuginfo/TestGccInterface.java
--- frysk-0.4/frysk-core/frysk/debuginfo/TestGccInterface.java.fix-duplicates	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-core/frysk/debuginfo/TestGccInterface.java	2009-06-19 15:48:11.000000000 -0400
@@ -77,7 +77,7 @@ public class TestGccInterface extends Te
     }
 
     public void testSimpleInterface() {
-	CompositeType type = getType("FunitSimpleInterfaceTest", "inter");
+	CompositeType type = getType("FunitSimpleInterfaceMain", "inter");
 
 	String expected;
 	if (BuildCompiler.supports_AT_INTERFACE()) {
diff -up frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java.fix-duplicates frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java
--- frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java.fix-duplicates	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterface.java	2009-06-19 15:48:11.000000000 -0400
@@ -37,6 +37,8 @@
 // version and license this file solely under the GPL without
 // exception.
 
+package frysk.pkglibdir;
+
 public interface FunitSimpleInterface {
 
     void simpleMethod();
diff -up frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java.fix-duplicates frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
--- frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java.fix-duplicates	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java	2009-06-19 15:48:11.000000000 -0400
@@ -37,10 +37,12 @@
 // version and license this file solely under the GPL without
 // exception.
 
-public class FunitSimpleInterfaceTest implements FunitSimpleInterface{
+package frysk.pkglibdir;
+
+public class FunitSimpleInterfaceMain implements FunitSimpleInterface{
 
     public static void main(String[] args) {
-	FunitSimpleInterface inter = new FunitSimpleInterfaceTest();
+	FunitSimpleInterface inter = new FunitSimpleInterfaceMain();
 	// Crash
 	Object o = null;
 	o.toString();
diff -up frysk-0.4/frysk-core/Makefile.am.fix-duplicates frysk-0.4/frysk-core/Makefile.am
--- frysk-0.4/frysk-core/Makefile.am.fix-duplicates	2008-06-09 14:03:07.000000000 -0400
+++ frysk-0.4/frysk-core/Makefile.am	2009-06-19 15:48:11.000000000 -0400
@@ -317,12 +317,6 @@ frysk/pkgdatadir/test-core-x86:
 	mkdir -p `dirname $@`
 	ln -s -f @abs_top_builddir@/../frysk-sys/$@ $@
 
-#FunitSimpleInterfaceTest
-pkglib_PROGRAMS += frysk/pkglibdir/FunitSimpleInterfaceTest
-frysk/pkglibdir/FunitSimpleInterfaceTest:
-	gcj -o $@ -g --main=FunitSimpleInterfaceTest $(srcdir)/frysk/pkglibdir/FunitSimpleInterfaceTest.java $(srcdir)/frysk/pkglibdir/FunitSimpleInterface.java
-
-
 # The following links two files into one executable
 pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-multi-file
 frysk_pkglibdir_funit_scopes_multi_file_SOURCES =

frysk-0.4-nogtkwerror.patch:
 Makefile.am |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE frysk-0.4-nogtkwerror.patch ---
diff -up frysk-0.4/frysk-gtk/tlwidgets/Makefile.am.2 frysk-0.4/frysk-gtk/tlwidgets/Makefile.am
--- frysk-0.4/frysk-gtk/tlwidgets/Makefile.am.2	2009-02-09 17:28:01.000000000 -0500
+++ frysk-0.4/frysk-gtk/tlwidgets/Makefile.am	2009-02-09 17:28:18.000000000 -0500
@@ -67,7 +67,6 @@ SRC=  $(tlwidgetssrc)/java/com/redhat/ft
       $(tlwidgetssrc)/java/com/redhat/ftk/CustomAtkObject.java 
 
 AM_CFLAGS = -fPIC -DPIC -std=gnu99 \
-	-Wall -Werror \
 	-I$(srcdir)/src/widgets \
 	$(FRYSK_GTK_CFLAGS)
 

frysk-0.4-strayelsif.patch:
 frysk-asm.h |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE frysk-0.4-strayelsif.patch ---
diff -up frysk-0.4/frysk-imports/include/frysk-asm.h.2 frysk-0.4/frysk-imports/include/frysk-asm.h
--- frysk-0.4/frysk-imports/include/frysk-asm.h.2	2009-02-09 16:17:15.000000000 -0500
+++ frysk-0.4/frysk-imports/include/frysk-asm.h	2009-02-09 16:18:06.000000000 -0500
@@ -564,7 +564,6 @@
 	.cfi_offset 30, 8          ; \
 	stw    31,  12(1)          ; \
 	.cfi_offset 31, 12         ;
-#elif
 #else
 #  warning "No function-prologue compound instruction defined"
 #endif

frysk-0.4-gcc-warnings.patch:
 frysk-imports/tests/frysk3525/exit47.c              |    2 +-
 frysk-imports/tests/frysk3595/detach-multi-thread.c |    2 +-
 frysk-sys/frysk/sys/proc/cni/Stat.cxx               |    4 ++--
 frysk-sys/frysk/sys/proc/jni/Stat.cxx               |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

Index: frysk-0.4-gcc-warnings.patch
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-13/frysk-0.4-gcc-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- frysk-0.4-gcc-warnings.patch	9 Feb 2009 23:54:31 -0000	1.1
+++ frysk-0.4-gcc-warnings.patch	24 Mar 2010 17:42:02 -0000	1.2
@@ -1,25 +1,3 @@
-diff -up frysk-0.4/frysk-gtk/tlwidgets/Makefile.am.2 frysk-0.4/frysk-gtk/tlwidgets/Makefile.am
---- frysk-0.4/frysk-gtk/tlwidgets/Makefile.am.2	2009-02-09 17:28:01.000000000 -0500
-+++ frysk-0.4/frysk-gtk/tlwidgets/Makefile.am	2009-02-09 17:28:18.000000000 -0500
-@@ -67,7 +67,6 @@ SRC=  $(tlwidgetssrc)/java/com/redhat/ft
-       $(tlwidgetssrc)/java/com/redhat/ftk/CustomAtkObject.java 
- 
- AM_CFLAGS = -fPIC -DPIC -std=gnu99 \
--	-Wall -Werror \
- 	-I$(srcdir)/src/widgets \
- 	$(FRYSK_GTK_CFLAGS)
- 
-diff -up frysk-0.4/frysk-imports/include/frysk-asm.h.2 frysk-0.4/frysk-imports/include/frysk-asm.h
---- frysk-0.4/frysk-imports/include/frysk-asm.h.2	2009-02-09 16:17:15.000000000 -0500
-+++ frysk-0.4/frysk-imports/include/frysk-asm.h	2009-02-09 16:18:06.000000000 -0500
-@@ -564,7 +564,6 @@
- 	.cfi_offset 30, 8          ; \
- 	stw    31,  12(1)          ; \
- 	.cfi_offset 31, 12         ;
--#elif
- #else
- #  warning "No function-prologue compound instruction defined"
- #endif
 diff -up frysk-0.4/frysk-imports/tests/frysk3525/exit47.c.2 frysk-0.4/frysk-imports/tests/frysk3525/exit47.c
 --- frysk-0.4/frysk-imports/tests/frysk3525/exit47.c.2	2008-06-09 14:03:07.000000000 -0400
 +++ frysk-0.4/frysk-imports/tests/frysk3525/exit47.c	2009-02-09 11:53:10.000000000 -0500


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/F-13/frysk.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- frysk.spec	17 Mar 2010 19:03:01 -0000	1.153
+++ frysk.spec	24 Mar 2010 17:42:02 -0000	1.154
@@ -1,7 +1,7 @@
 Summary:	Execution analysis and debugging tool-suite.
 Name:		frysk
 Version:	0.4
-Release:	15%{?dist}
+Release:	16%{?dist}
 
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # getopt is GPLv2 with exception
@@ -15,14 +15,22 @@ License:	GPLv2 with exceptions and BSD a
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2
+
+# Local fixes.
 Patch1:		frysk-0.4-bash-dollar-star.patch
-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
+Patch2:		frysk-0.4-strayelsif.patch
+Patch3:		frysk-0.4-fdebugrpm.patch
+Patch4:		frysk-0.4-mktlwidgetdir.patch
+Patch5:		frysk-0.4-gcc-warnings.patch
+Patch6:		frysk-0.4-funitexitman.patch
+Patch7:		frysk-0.4-mvtesttomain.patch
+
+Patch100:	frysk-0.4-aclocaljavac.patch
+
+# Do not push these upstream
+Patch1001:	frysk-0.4-elfutilsdeps.patch
+Patch1002:	frysk-0.4-elfutilsfstat.patch
+Patch1003:	frysk-0.4-nogtkwerror.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -114,17 +122,26 @@ This package contains the GNOME front en
 
 %setup -q -n %{name}-%{version}
 pwd
+
 %patch1 -p1 -z .bash-dollar-star
-%patch2 -p1 -z .gcc-warnings
+%patch2 -p1 -z .strayelsif
+%patch3 -p1 -z .fdebugrpm
+%patch4 -p1 -z .mktlwidgetdir
+%patch5 -p1 -z .gcc-warnings
+%patch6 -p1 -z .funitexitman
 mv frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
-%patch3 -p1 -z .fix-duplicates
-%patch4 -p1 -z .fdebugrpm
+%patch7 -p1 -z .mvtesttomain -F 1
+
 %if %{fedora}0 >= 130
-%patch5 -p1 -z .aclocaljavac
+%patch100 -p1 -z .aclocaljavac
 %endif
-%patch6 -p1 -z .elfutilsdeps
-%patch7 -p1 -z .elfutilsdeps
-%patch8 -p1 -z .mktlwidgetdir
+
+%patch1001 -p1 -z .elfutilsdeps
+%patch1002 -p1 -z .elfutilsfstat
+%patch1003 -p1 -z .nogtkwerror
+
+echo "%{version}-%{release}" > frysk-common/version.in
+
 ./bootstrap.sh
 
 %build 
@@ -292,16 +309,19 @@ rm -rf %{buildroot}
 %{_mandir}/man1/frysk.1.gz
 
 %changelog
-* Wed Mar 17 2010 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-15
+* Wed Mar 24 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-16
+- Re-organize local patches, blat the version.
+
+* Wed Mar 17 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-15
 - Fix manpage typos - frysk-0.4-manpages.patch
 
-* Wed Mar 17 2010 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-14
+* Wed Mar 17 2010 Andrew 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
+* Mon Mar 15 2010 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-13
 - Fix debuginforpm's sed line (from  Stephen Tweedie).
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.4-12
@@ -310,11 +330,11 @@ rm -rf %{buildroot}
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Fri Jun 19 2009 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-10
+* Fri Jun 19 2009 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-10
 - Add frysk-0.4-fix-duplicates.patch to address duplicated install
   problems.
 
-* Fri Jun 19 2009 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-9
+* Fri Jun 19 2009 Andrew Cagney <cagney [at] fedoraproject.org> - 0.4-9
 - Add sparc64 and s390x to ExcludeArch.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-8


--- frysk-0.4-fix-duplicates.patch DELETED ---

