rpms/frysk/devel frysk-0.4-fix-duplicates.patch, NONE, 1.1 frysk.spec, 1.147, 1.148

[cagney]

Author: cagney

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

Modified Files:
	frysk.spec 
Added Files:
	frysk-0.4-fix-duplicates.patch 
Log Message:
* Fri Jun 19 2009 Andrw Cagney <cagney [at] fedoraproject.org> - 0.4-10
- Add frysk-0.4-fix-duplicates.patch to address duplicated install
  problems.


frysk-0.4-fix-duplicates.patch:

--- NEW FILE frysk-0.4-fix-duplicates.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/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">
  ]
 >
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 =


Index: frysk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- frysk.spec	19 Jun 2009 15:18:15 -0000	1.147
+++ frysk.spec	19 Jun 2009 21:04:43 -0000	1.148
@@ -1,7 +1,7 @@
 Summary:	Execution analysis and debugging tool-suite.
 Name:		frysk
 Version:	0.4
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 # antlrv2 is Public Domain; antlrv3 is BSD.
 # getopt is GPLv2 with exception
@@ -17,6 +17,7 @@ URL:		http://sourceware.org/frysk
 Source:		ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2
 Patch1:		frysk-0.4-bash-dollar-star.patch
 Patch2:		frysk-0.4-gcc-warnings.patch
+Patch3:		frysk-0.4-fix-duplicates.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -108,8 +109,10 @@ This package contains the GNOME front en
 
 %setup -q -n %{name}-%{version}
 pwd
-%patch1 -p1 -z .1
-%patch2 -p1 -z .2
+%patch1 -p1 -z .bash-dollar-star
+%patch2 -p1 -z .gcc-warnings
+mv frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
+%patch3 -p1 -z .fix-duplicates
 ./bootstrap.sh
 
 %build 
@@ -240,7 +243,7 @@ rm -rf %{buildroot}
 %{_libdir}/libfrysk-junit.so
 
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/FunitSimpleInterfaceTest
+%{_libdir}/%{name}/FunitSimpleInterfaceMain
 %{_libdir}/%{name}/fsystest
 %{_libdir}/%{name}/ftail
 %{_libdir}/%{name}/funit*
@@ -277,6 +280,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/frysk.1.gz
 
 %changelog
+* Fri Jun 19 2009 Andrw 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
 - Add sparc64 and s390x to ExcludeArch.