rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.64,1.65

[Lubomir Rintel (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18038/devel

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
Synchronize fedora and EPEL packages


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- java-1.6.0-openjdk.spec	21 Jul 2008 20:52:40 -0000	1.64
+++ java-1.6.0-openjdk.spec	25 Jul 2008 08:56:36 -0000	1.65
@@ -109,7 +109,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.19.%{openjdkver}%{?dist}
+Release: 0.20.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -139,6 +139,7 @@
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 Patch2: java-1.6.0-openjdk-makefile.patch
+Patch3:   java-1.6.0-openjdk-freetype.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -146,7 +147,11 @@
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: giflib-devel
+%if 0%{?fedora}
 BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
 BuildRequires: libX11-devel
 BuildRequires: libXi-devel
 BuildRequires: libXp-devel
@@ -171,7 +176,7 @@
 BuildRequires: xorg-x11-server-Xvfb
 BuildRequires: xorg-x11-fonts-Type1
 BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype-devel >= 2.3.0
+BuildRequires: freetype-devel >= 2.2.0
 BuildRequires: fontconfig
 BuildRequires: eclipse-ecj
 # Java Access Bridge for GNOME build requirements.
@@ -190,10 +195,16 @@
 %endif
 
 Requires: libjpeg = 6b
+%if 0%{?fedora} > 9
 # Require /etc/pki/java/cacerts.
 Requires: ca-certificates
+%else
+# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
+# cacerts.
+Requires: openssl
+%endif
 # Require jpackage-utils for ant.
-Requires: jpackage-utils >= 1.7.3-1jpp.3
+Requires: jpackage-utils >= 1.7.3-1jpp.2
 # Require zoneinfo data provided by tzdata-java subpackage.
 Requires: tzdata-java
 # Post requires alternatives to install tool alternatives.
@@ -347,7 +358,13 @@
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
+pushd openjdk-ecj
+  patch -l -p2 < %{PATCH3}
+popd
 %endif
+make stamps/patch.stamp
+patch -l -p1 < %{PATCH3}
+
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -408,6 +425,7 @@
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
   cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
 
+%if 0%{?fedora} > 9
   # Install cacerts symlink.
   rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts
   pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
@@ -415,6 +433,7 @@
       %{_jvmdir}/%{jredir}/lib/security)
     ln -sf $RELATIVE/cacerts .
   popd
+%endif
 
   # Install extension symlinks.
   install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir}
@@ -497,7 +516,7 @@
 # Install desktop files.
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
 cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-desktop-file-install \
+desktop-file-install --vendor ''\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
 for e in jconsole policytool ; do
     desktop-file-install --vendor=fedora --mode=644 \
@@ -798,7 +817,6 @@
 %{jvmjardir}
 %dir %{_jvmdir}/%{jredir}/lib/security
 %{_jvmdir}/%{jredir}/lib/security/cacerts
-# FIXME: These should be replaced by symlinks into /etc.
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
 %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
@@ -888,6 +906,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Wed Jul 23 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0-0.20.b11
+- Specify vendor for javaws desktop entry.
+- Merge EPEL-5 and Fedora devel packages.
+
 * Mon Jul 21 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.19.b11
 - Updated icedteasnapshot.
 
@@ -995,6 +1017,11 @@
 - Added archbuild and archinstall definitions for ia64.
 - Resolves: rhbz#433843
 
+* Mon Apr 28 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-0.12.b08
+- Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL:
+- Require Freetype 2.2.0 instead of 2.3.0.
+- Build against openmotif instead of lesstif when not on Fedora.
+
 * Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.10.b09
 - Fixed installation of javaws.desktop and javaws.png.