harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arc...@apache.org
Subject svn commit: r368574 - in /incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc: Makefile.am classpath.spec.in jchevm.spec.in jcvm.spec.in
Date Fri, 13 Jan 2006 03:25:35 GMT
Author: archie
Date: Thu Jan 12 19:25:29 2006
New Revision: 368574

URL: http://svn.apache.org/viewcvs?rev=368574&view=rev
Log:
Update RPM spec files to reflect current reality.

Added:
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jchevm.spec.in
      - copied, changed from r368557, incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jcvm.spec.in
Removed:
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jcvm.spec.in
Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/Makefile.am
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/classpath.spec.in

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/Makefile.am?rev=368574&r1=368573&r2=368574&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/Makefile.am (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/Makefile.am Thu Jan
12 19:25:29 2006
@@ -5,25 +5,25 @@
 dist_jcetc_DATA=	jc.conf
 
 EXTRA_DIST=		gdb.userdef makedist.sh jc.xpm \
-			classpath.spec.in jcvm.spec.in
+			classpath.spec.in jchevm.spec.in
 
-rpms:			classpath-rpm jcvm-rpm
+rpms:			classpath-rpm jchevm-rpm
 
 classpath-rpm:		rpmdirs
 	DIR=`pwd`; \
 	rpmbuild -bb --clean --define "_topdir $${DIR}/rpm" classpath.spec
 
-jcvm-rpm:		rpmdirs
+jchevm-rpm:		rpmdirs
 	DIR=`pwd`; \
 	cp $(srcdir)/jc.xpm $${DIR}/rpm/SOURCES; \
-	rpmbuild -bb --clean --define "_topdir $${DIR}/rpm" jcvm.spec
+	rpmbuild -bb --clean --define "_topdir $${DIR}/rpm" jchevm.spec
 
 rpmdirs:
 	@for DIR in rpm rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS; do \
 	    [ -d "$${DIR}" ] || mkdir "$${DIR}"; \
 	done
 	@RESULT="true"; \
-	for TGZ in classpath-$(CLASSPATH_VERSION) jc-$(VERSION); do \
+	for TGZ in classpath-$(CLASSPATH_VERSION) jchevm-$(VERSION); do \
 	    if ! [ -f rpm/SOURCES/$$TGZ.tar.gz ]; then \
 		echo Please copy $$TGZ.tar.gz into rpm/SOURCES; \
 		RESULT="false"; \

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/classpath.spec.in
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/classpath.spec.in?rev=368574&r1=368573&r2=368574&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/classpath.spec.in
(original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/classpath.spec.in
Thu Jan 12 19:25:29 2006
@@ -1,19 +1,28 @@
-# $Id: classpath.spec.in,v 1.1 2005/03/20 20:13:57 archiecobbs Exp $
+# $Id$
 
 %define version_num @CLASSPATH_VERSION@
 %define release_num 1
 
-Summary: GNU Classpath Java class libraries
-Name: classpath
-Version: %{version_num}
-Release: %{release_num}
-Group: Development/Tools
-Copyright: GPL+exception
-URL: http://www.classpath.org/
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: jikes, zip
-Packager: Archie Cobbs <archie@dellroad.org>
-Source: ftp://ftp.gnu.org/pub/gnu/classpath/classpath-%{version_num}.tar.gz
+Summary:	GNU Classpath Java class libraries
+Name:		classpath
+Version:	%{version_num}
+Release:	%{release_num}
+Group	:	Development/Tools
+Copyright:	GPL+exception
+URL:		http://www.classpath.org/
+BuildRoot:	%{_tmppath}/%{name}-root
+BuildRequires:	jikes >= 1.22
+BuildRequires:	zip
+BuildRequires:	gtk2-devel >= 2.4
+BuildRequires:	libart_lgpl
+BuildRequires:	cairo >= 0.5.0
+BuildRequires:	pango-devel
+BuildRequires:	freetype2-devel
+BuildRequires:	libxml2 >= 2.6.8
+BuildRequires:	libxslt >= 1.1.11
+BuildRequires:	alsa-devel
+Packager:	Archie Cobbs <archie@dellroad.org>
+Source:		ftp://ftp.gnu.org/pub/gnu/classpath/classpath-%{version_num}.tar.gz
 
 %description
 GNU Classpath, Essential Libraries for Java, is a GNU project to create
@@ -25,12 +34,7 @@
 
 %build
 pushd ${RPM_BUILD_DIR}/classpath-%{version_num}
-# Determine if we can build the GTK stuff
-GTKPEER='disable'
-if pkg-config --exists 'gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0';
then
-    GTKPEER='enable'
-fi
-%configure --with-jikes --enable-jni --${GTKPEER}-gtk-peer
+%configure --with-jikes --enable-jni
 make
 popd
 
@@ -55,12 +59,12 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING LICENSE README THANKYOU
+%doc AUTHORS COPYING LICENSE README THANKYOU HACKING TODO BUGS
 %{_libdir}/classpath
 %dir %{_datadir}/classpath
 %{_libdir}/security/classpath.security
 %{_datadir}/classpath/glibj.zip
-%doc %{_datadir}/classpath/api
+%{_includedir}/*
 %doc %{_datadir}/classpath/examples
 %doc %{_infodir}/*
 

Copied: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jchevm.spec.in
(from r368557, incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jcvm.spec.in)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jchevm.spec.in?p2=incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jchevm.spec.in&p1=incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jcvm.spec.in&r1=368557&r2=368574&rev=368574&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jcvm.spec.in (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/jchevm.spec.in Thu
Jan 12 19:25:29 2006
@@ -1,35 +1,31 @@
-# $Id: jcvm.spec.in,v 1.5 2005/03/21 14:10:50 archiecobbs Exp $
+# $Id$
 
 %define version_num @VERSION@
 %define release_num 1
 %define classpath_ver @CLASSPATH_VERSION@
-%define classpath_home %{_prefix}
+%define classpath_home /usr/local/classpath
 
-Summary: The JC Virtual Machine
-Name: jcvm
-Version: %{version_num}
-Release: %{release_num}
-Group: Development/Tools
-Copyright: LGPL
-URL: http://jcvm.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-root
-Icon: jc.xpm
-Packager: Archie Cobbs <archie@dellroad.org>
-Source: http://internap.dl.sourceforge.net/sourceforge/jcvm/jc-%{version_num}.tar.gz
-ExclusiveArch: i386 i486 i586 i686
-Requires: classpath >= %{classpath_ver}
+Summary:	The JC Virtual Machine
+Name:		jchevm
+Version:	%{version_num}
+Release:	%{release_num}
+Group:		Development/Tools
+Copyright:	Apache
+URL:		http://incubator.apache.org/harmony/
+BuildRoot:	%{_tmppath}/%{name}-root
+Icon:		jc.xpm
+Packager:	Archie Cobbs <archie@dellroad.org>
+Source:		http://incubator.apache.org/harmony/jchevm-%{version_num}.tar.gz
+ExclusiveArch:	i386 i486 i586 i686
+Requires:	classpath >= %{classpath_ver}
 
 %description
-JC is a Java virtual machine implementation that converts class files
-into C source files using the Soot Java bytecode analysis framework,
-compiles them with GCC, and loads them using a built-in ELF object file
-loader. JC utilizes the GNU Classpath class library and provides a fairly
-complete Java runtime including sophisticated optimizations to increase
-runtime performance. JC also includes a bytecode interpreter, and supports
-execution in either or mixed modes.
+JC Harmony Edition is a Java virtual machine implementation that
+performs fast bytecode interpretation and uses GNU Classpath as
+its class library.
 
 %prep
-%setup -n jc-%{version}
+%setup -n %{name}-%{version_num}
 
 %build
 %configure --with-classpath=%{classpath_home}
@@ -47,15 +43,13 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS CHANGES LGPL-2.1 LICENSE README
+%doc AUTHORS LICENSE README
 %{_bindir}/cfdump
 %{_bindir}/jc
-%{_bindir}/jcgen
 %{_bindir}/jcjavah
 %{_datadir}/jc
 %docdir %{_datadir}/jc/doc
 %{_includedir}/jc
-%{_libdir}/jc
 %{_libdir}/libjc.*
 %config %{_sysconfdir}/jc.conf
 %doc %{_mandir}/man1/jc.1.gz



Mime
View raw message