Author: pawelz Date: Wed Dec 30 17:09:30 2009 GMT
Module: packages Tag: OPENJDK-1_6
---- Log message:
- unified with java-sun (Version format, some macros)
- some work on %install section
- NFY
---- Files affected:
packages/openjdk:
openjdk.spec (1.8.2.8 -> 1.8.2.9)
---- Diffs:
================================================================
Index: packages/openjdk/openjdk.spec
diff -u packages/openjdk/openjdk.spec:1.8.2.8
packages/openjdk/openjdk.spec:1.8.2.9
--- packages/openjdk/openjdk.spec:1.8.2.8 Wed Dec 30 16:30:45 2009
+++ packages/openjdk/openjdk.spec Wed Dec 30 18:09:25 2009
@@ -2,16 +2,16 @@
#
# class data version seen with file(1) that this jvm is able to load
%define _classdataversion 50.0
-%define buildnum b17
+%define buildnum 17
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.6.%{buildnum}
+Version: 1.6.0.%{buildnum}
Release: 0.1
License: GPL v2
Group: Applications
-Source0:
http://download.java.net/openjdk/jdk6/promoted/%{buildnum}/%{name}-6-src-%{buildnum}-14_oct_2009.tar.gz
+Source0:
http://download.java.net/openjdk/jdk6/promoted/b%{buildnum}/%{name}-6-src-b%{buildnum}-14_oct_2009.tar.gz
# Source0-md5: 078fe0ab744c98694decc77f2456c560
Patch0: %{name}-build.patch
URL: http://openjdk.dev.java.net/
@@ -31,9 +31,25 @@
BuildRequires: unzip
BuildRequires: zip
Provides: java(ClassDataVersion) = %{_classdataversion}
-ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define javareldir %{name}-%{version}
+%define javadir %{_jvmdir}/%{javareldir}
+%define jrereldir %{javareldir}/jre
+%define jredir %{_jvmdir}/%{jrereldir}
+%define jvmjardir %{_jvmjardir}/%{name}-%{version}
+
+
+%ifarch %{ix86}
+%define arch i586
+%endif
+
+%ifarch %{x8664}
+%define arch amd64
+%endif
+
+%define builddir build/%{_os}-%{javaarch}
+
# make -j1 does not work because there is some stupid magick which takes MFLAGS
# and says -jN is not allowed. remove %{_smp_mflags} from %__make.
%{expand:%%global __make %(echo %{__make} | sed -e
's/%{?_smp_mflags}\b//')}
@@ -69,30 +85,30 @@
OPT_CFLAGS="%{rpmcflags}" \
WARNINGS_ARE_ERRORS='' \
ALT_BOOTDIR=%{java_home} \
-%ifarch %{x8664}
- ARCH_DATA_MODEL=64
-%endif
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} export_product \
- ALT_BOOTDIR=%{java_home} \
- EXPORT_PATH=$RPM_BUILD_ROOT%{_prefix} \
- EXPORT_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \
- EXPORT_JRE_LIB_ARCH_DIR=$RPM_BUILD_ROOT%{_libdir}/jre \
- EXPORT_DOCS_DIR=$RPM_BUILD_ROOT%{_docdir} \
-%ifarch %{x8664}
- ARCH_DATA_MODEL=64
-%endif
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_mandir},%{_bindir},%{_jvmdir}}
-rm -rf jvmti
-mv $RPM_BUILD_ROOT%{_docdir}/platform/jvmti .
+cp -a %{builddir}/j2sdk-image $RPM_BUILD_ROOT%{javadir}
+rm
$RPM_BUILD_ROOT%{javadir}/{,jre/}{ASSEMBLY_EXCEPTION,LICENSE,THIRD_PARTY_README}
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_bindir}}
-cp -a compiler/dist/lib/javac.jar
$RPM_BUILD_ROOT%{_javadir}/javac-%{version}.jar
-ln -s javac-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/javac.jar
-install -p javac $RPM_BUILD_ROOT%{_bindir}
+cd $RPM_BUILD_ROOT%{javadir}/bin
+for I in *; do
+ ln -s %{javadir}/bin/$I %{_bindir}/$I
+done
+cd -
+
+cd $RPM_BUILD_ROOT%{javadir}/jre/bin
+for I in *; do
+ ln -s %{javadir}/jre/bin/$I %{_bindir}/$I
+done
+cd -
+
+rm -rf $RPM_BUILD_ROOT%{javadir}/man
+install %{builddir}/j2sdk/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+install %{builddir}/j2sdk/man/ja/man1/* $RPM_BUILD_ROOT%{_mandir}/ja/man1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -102,7 +118,9 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
+%doc ASSEMBLY_EXCEPTION README THIRD_PARTY_README TRADEMARK
+%{_mandir}/man1/*
+%lang(ja) %{_mandir}/ja/man1/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -110,6 +128,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8.2.9 2009/12/30 17:09:25 pawelz
+- unified with java-sun (Version format, some macros)
+- some work on %install section
+- NFY
+
Revision 1.8.2.8 2009/12/30 15:30:45 sparky
- BR: alsa-lib-devel, gawk, java-xerces, openmotif-devel, procps, unzip, zip
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openjdk/openjdk.spec?r1=1.8.2.8&r2=1.8.2.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
