packages (OPENJDK-1_6): openjdk/openjdk.spec - NFY

pawelz pawelz at pld-linux.org
Wed Dec 30 14:31:16 CET 2009 

Author: pawelz                       Date: Wed Dec 30 13:31:16 2009 GMT
Module: packages                      Tag: OPENJDK-1_6
---- Log message:
- NFY

---- Files affected:
packages/openjdk:
   openjdk.spec (1.8 -> 1.8.2.1) 

---- Diffs:

================================================================
Index: packages/openjdk/openjdk.spec
diff -u packages/openjdk/openjdk.spec:1.8 packages/openjdk/openjdk.spec:1.8.2.1
--- packages/openjdk/openjdk.spec:1.8	Wed Apr 18 01:02:30 2007
+++ packages/openjdk/openjdk.spec	Wed Dec 30 14:31:11 2009
@@ -1,92 +1,66 @@
 # $Revision$, $Date$
-# TODO
-# - all
-
-# broken
-%define	_enable_debug_packages 0
-
+#
 # class data version seen with file(1) that this jvm is able to load
-%define		_classdataversion 50.0
+%define		_classdataversion	50.0
+%define		buildnum		b17
+
 Summary:	Open-source JDK, an implementation of the Java Platform
 Summary(pl.UTF-8):	JDK o otwartych źrodłach - implementacja platformy Java
 Name:		openjdk
-Version:	1.7.0
+Version:	1.6.%{buildnum}
 Release:	0.1
 License:	GPL v2
-Group:		Development/Languages/Java
-Source0:	http://www.java.net/download/openjdk/jdk7/promoted/b11/compiler-7-ea-src-b11-10_apr_2007.zip
-# Source0-md5:	07d66408d68b41a7884cd2f176c41ce2
-Source1:	http://www.java.net/download/openjdk/jdk7/promoted/b11/hotspot-7-ea-src-b11-10_apr_2007.zip
-# Source1-md5:	55c9920bc0ce1b6459f09eb030b4d9d3
-Source2:	http://www.java.net/download/openjdk/jdk7/promoted/b11/jtreg_bin-3_2_2_01-fcs-bin-b03-10_Apr_2007.zip
-# Source2-md5:	185807a77cd29792f58291f42f6b25ac
-Source3:	Test.java
-URL:		https://openjdk.dev.java.net/
+Group:		Applications
+Source0:	http://download.java.net/openjdk/jdk6/promoted/%{buildnum}/%{name}-6-src-%{buildnum}-14_oct_2009.tar.gz
+# Source0-md5:	-
+Patch0:		%{name}-build.patch
+URL:		http://openjdk.dev.java.net/
 BuildRequires:	ant
+BuildRequires:	cups-devel
 BuildRequires:	file
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-static
 BuildRequires:	rpmbuild(macros) >= 1.357
 Provides:	java(ClassDataVersion) = %{_classdataversion}
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Today this project contains two significant components of the JDK:
-- The HotSpot Virtual Machine
-- The Java programming-language compiler (javac), with complete
-  NetBeans project metadata
+Open-source JDK, an implementation of the Java Platform.
 
 %description -l pl.UTF-8:
-Aktualnie ten projekt zawiera dwa znaczące składniki JDK:
-- maszynę wirtualną HotSpot
-- kompilator Javy (javac) z pełnymi metadanymi projektu NetBeans
+JDK o otwartych źrodłach - implementacja platformy Java.
 
 %prep
-%setup -qc -a1 -a2
-cat <<'EOF' > javac
-#!/bin/sh
-exec java -jar %{_javadir}/javac-%{version}.jar ${1:+"$@"}
-EOF
+%setup -q -c
 
-cp %{SOURCE3} Test.java
+%patch0 -p0
 
 %build
-# HotSpot
-HOTSPOT_BUILD_JOBS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)#\1#g')"
-[ "$HOTSPOT_BUILD_JOBS" = "%{__make}" ] && HOTSPOT_BUILD_JOBS=1
-HOTSPOT_BUILD_JOBS=$(echo $HOTSPOT_BUILD_JOBS)
+unset JAVA_HOME
+unset CLASSPATH
+LC_ALL=C
+LANG=C
+export JAVA_HOME CLASSPATH LC_ALL LANG
 
+%{__make} sanity
 %{__make} \
-	-j1 HOTSPOT_BUILD_JOBS=$HOTSPOT_BUILD_JOBS \
+	UTILS_USR_BIN_PATH=""
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	OPT_CFLAGS="%{rpmcflags}" \
 	WARNINGS_ARE_ERRORS='' \
-	-C hotspot/make \
 	ALT_BOOTDIR=%{java_home} \
 %ifarch %{x8664}
 	ARCH_DATA_MODEL=64
 %endif
 
-# Compiler
-cd compiler
-%ant
-cd -
-
-# Test Class Data Version
-./compiler/dist/bin/javac Test.java
-classver=$(file Test.class | grep -o 'compiled Java class data, version [0-9.]*' | awk '{print $NF}')
-if [ "$classver" != %{_classdataversion} ]; then
-	echo "Set %%define _classdataversion to $classver and rerun."
-	exit 1
-fi
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} export_product \
-	-C hotspot/make \
 	ALT_BOOTDIR=%{java_home} \
 	EXPORT_PATH=$RPM_BUILD_ROOT%{_prefix} \
 	EXPORT_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \
@@ -107,27 +81,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc compiler/doc/* jvmti
-
-# hotspot
-%dir %{_libdir}/jre
-%attr(755,root,root) %{_libdir}/jre/libsaproc.so
-%dir %{_libdir}/jre/server
-%{_libdir}/jre/server/Xusage.txt
-%attr(755,root,root) %{_libdir}/jre/server/libjsig.so
-%attr(755,root,root) %{_libdir}/jre/server/libjvm.so
-%{_libdir}/sa-jdi.jar
-%{_includedir}/jmm.h
-%{_includedir}/jni.h
-%{_includedir}/jvmti.h
-%{_includedir}/linux/jni_md.h
-
-# compiler
-%attr(755,root,root) %{_bindir}/javac
-%{_javadir}/javac-%{version}.jar
-%{_javadir}/javac.jar
+%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -135,27 +94,6 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.8  2007/04/17 23:02:30  glen
-- built something on carme
-
-Revision 1.7  2007/04/17 21:05:24  glen
-- new snapshot (build still fails on ac)
-
-Revision 1.6  2007/04/16 16:39:16  qboosh
-- pl
-
-Revision 1.5  2007/04/11 11:05:47  glen
-- build hotspot first
-- BR and EA
-
-Revision 1.4  2007/04/11 10:38:26  glen
-- now requires jdk to build javac.jar
-
-Revision 1.3  2007/04/09 22:34:34  glen
-- BR: file
-
-Revision 1.2  2007/04/09 22:34:03  glen
-- provide java(ClassDataVersion)
+Revision 1.8.2.1  2009/12/30 13:31:11  pawelz
+- NFY
 
-Revision 1.1  2007/04/09 22:31:40  glen
-- new, sun's GPLv2 licensed jdk/jre
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openjdk/openjdk.spec?r1=1.8&r2=1.8.2.1&f=u

More information about the pld-cvs-commit mailing list