rpms/frysk/devel frysk-makefileam.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 frysk.spec, 1.18, 1.19 sources, 1.5, 1.6

Thu Dec 22 21:40:04 UTC 2005

Author: cagney

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20277

Modified Files:
	.cvsignore frysk.spec sources 
Added Files:
	frysk-makefileam.patch 
Log Message:
* Thu Dec 22 2005 Andrew Cagney <cagney at redhat.com> 0.0.1.2005.12.14.15.12-0.FC4.1
- Import frysk-0.0.1.2005.12.14.15.12 rpm.
- Drop build dependency java-1.4.2-gcj-compat-devel
- Apply Patch003, frysk-makefileam.patch.


frysk-makefileam.patch:
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE frysk-makefileam.patch ---
diff -ur ./frysk-0.0.0.20051211.1.orig/frysk-imports/tests/Makefile.am ./frysk-0.0.0.20051211.1/frysk-imports/tests/Makefile.am
--- ./frysk-0.0.0.20051211.1.orig/frysk-imports/tests/Makefile.am	2005-12-09 16:07:45.000000000 -0600
+++ ./frysk-0.0.0.20051211.1/frysk-imports/tests/Makefile.am	2005-12-12 12:35:27.000000000 -0600
@@ -204,8 +204,8 @@
 		$(srcdir)/gcjtreeiter/IterTest.java
 	echo $(GIJ) -classpath $(srcdir)/..:$(GTK2_JAR):$(GLIB_JAVA_JAR) \
 		-Djava.library.path=/opt/frysk/lib gcjtreeiter.IterTest \
-		> gcjtreeiter/$(GIJ).sh
-	chmod a+x gcjtreeiter/$(GIJ).sh
+		> gcjtreeiter/gij.sh
+	chmod a+x gcjtreeiter/gij.sh
 
 cdtparserversion_FILES = cdtparserversion/CDTParserTest.java
 #cdtparserversion_FILES += cdtparserversion/main.cpp


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Nov 2005 16:40:21 -0000	1.5
+++ .cvsignore	22 Dec 2005 21:40:01 -0000	1.6
@@ -1 +1 @@
-frysk-0.0.0.20051116.tar.gz
+frysk-0.0.1.2005.12.14.15.12.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- frysk.spec	9 Dec 2005 20:41:50 -0000	1.18
+++ frysk.spec	22 Dec 2005 21:40:01 -0000	1.19
@@ -29,19 +29,17 @@
 %endif
 
 
-%define	version		0.0.0.20051116	
-%define release 0.5.1
-
 #-----------------------------------------------------------------
 
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	%{version}
-Release: %{release}.1
+Version:	0.0.1.2005.12.14.15.12
+Release:	0.FC4.1
 License:	LGPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
-Source:		%{name}-%{version}.tar.gz
+Source:		%{name}-%{version}.tar.bz2
+Patch003:	frysk-makefileam.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -60,8 +58,6 @@
 BuildRequires:  %{java_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:	%{java_pkg_prefix}libvte-java-devel >= 0.11.11
 BuildRequires:  vte-devel >= 0.11.11
-BuildRequires: 	java-1.4.2-gcj-compat-devel
-
 
 # We can only build on i386 for now
 ExclusiveArch: i386
@@ -77,9 +73,24 @@
 %prep
 
 %setup -q -n %{name}-%{version}
-
+%patch003 -p2 -b .makefileam
+./autogen.sh
 
 %build 
+
+export JAVAC=${JAVAC:-/usr/bin/gcj -C}
+export GCJ=${GCJ:-/usr/bin/gcj}
+export GIJ=${GIJ:-/usr/bin/gij}
+export JAR=${JAR:-/usr/bin/fastjar}
+export GCJH=${GCJH:-/usr/bin/gcjh}
+export GCJ_DBTOOL=${GCJ_DBTOOL:-/usr/bin/gcj-dbtool}
+export GCC=${GCC:-/usr/bin/gcc}
+export CC=${CC:-/usr/bin/gcc}
+export CXX=${CXX:-/usr/bin/g++}
+export JAVA=${JAVA:-/usr/bin/gij}
+export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
+
+
 # For now we add /opt/frysk/lib/pkgconfig to the path to indicate that
 # all the needed packages are installed there.
 if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
@@ -117,6 +128,11 @@
 %{_datadir}/java/*.jar
 
 %changelog
+* Thu Dec 22 2005 Andrew Cagney <cagney at redhat.com> 0.0.1.2005.12.14.15.12-0.FC4.1
+- Import frysk-0.0.1.2005.12.14.15.12 rpm.
+- Drop build dependency java-1.4.2-gcj-compat-devel
+- Apply Patch003, frysk-makefileam.patch.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Nov 2005 16:40:21 -0000	1.5
+++ sources	22 Dec 2005 21:40:01 -0000	1.6
@@ -1 +1 @@
-5837e59a8d3c609a847ce5cd77f23918  frysk-0.0.0.20051116.tar.gz
+058590e5430327f3e4ace6646dec5751  frysk-0.0.1.2005.12.14.15.12.tar.bz2


