From f659595d882192d2a186e2e5a669cc5c6f7f2536 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mar 29 2013 13:04:26 +0000 Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/java-1.7.0-openjdk Conflicts: java-1.7.0-openjdk.spec --- diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index 37c11b0..5c4b6fa 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -106,7 +106,7 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global buildver 9 +%global buildver 17 # Keep priority on 6digits in case buildver>9 %global priority 17000%{buildver} %global javaver 1.7.0 @@ -149,7 +149,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: %{icedtea_version}.2%{?dist} +Release: %{icedtea_version}.4%{?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 @@ -434,6 +434,7 @@ BuildRequires: redhat-lsb BuildRequires: zip BuildRequires: fontconfig BuildRequires: xorg-x11-fonts-Type1 +BuildRequires: zlib > 1.2.3-6 %if %{gcjbootstrap} BuildRequires: java-1.5.0-gcj-devel %else @@ -734,11 +735,6 @@ patch -l -p0 < %{PATCH105} patch -l -p0 < %{PATCH500} %endif - - -# Add a "-icedtea" tag to the version -sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)-icedtea#" openjdk/jdk/make/common/shared/Defs.gmk - # Build the re-written rhino jar mkdir -p rhino/{old,new} @@ -1173,6 +1169,18 @@ fi exit 0 %postun +%ifarch %{jit_arches} + if [ $1 -eq 0 ] + then + #see https://bugzilla.redhat.com/show_bug.cgi?id=918172 + f="%{_jvmdir}/%{jrelnk}/lib/%{archinstall}/server/classes.jsa" + if [ -f "$f" ] + then + rm -rf "$f" + fi + fi +%endif + if [ $1 -eq 0 ] then alternatives --remove java %{jrebindir}/java @@ -1349,7 +1357,9 @@ exit 0 %{_mandir}/man1/unpack200-%{name}.1* %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg %{_jvmdir}/%{jredir}/lib/audio/ -%attr(664, root, root) %ghost %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/server/classes.jsa +%ifarch %{jit_arches} +%attr(664, root, root) %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/server/classes.jsa +%endif %files devel @@ -1424,9 +1434,20 @@ exit 0 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %changelog -* Fri Mar 29 2013 Jiri Vanek - 1.7.0.9-2.3.8.1.fc20 +* Fri Mar 29 2013 Jiri Vanek - 1.7.0.9-2.3.8.4.fc20 - Updated to java-access-bridge-1.26.2.tar.bz2 +* Tue Mar 26 2013 Jiri Vanek - 1.7.0.9-2.3.8.3.fc20 +- added manual deletion of classes.jsa +- ghost classes.jsa restricted to jitarches and to full path +- zlib in BuildReq restricted for 1.2.3-7 or higher + - see https://bugzilla.redhat.com/show_bug.cgi?id=904231 + +* Tue Mar 26 2013 Jiri Vanek - 1.7.0.9-2.3.8.2.fc20 +- Removed a -icedtea tag from the version + - package have less and less connections to icedtea7 +- Added link to nss as noreplace bug to previous changelog item + * Mon Mar 25 2013 Jiri Vanek - 1.7.0.9-2.3.8.1.fc20 - Bumped release - Added and applied patch500 java-1.7.0-openjdk-fixZeroAllocFailure.patch @@ -1443,6 +1464,7 @@ exit 0 - classes.jsa marked as ghost - see https://bugzilla.redhat.com/show_bug.cgi?id=918172 for details - nss.cfg was marked as config(noreplace) + - see https://bugzilla.redhat.com/show_bug.cgi?id=913821 for details * Mon Mar 04 2013 Omair Majid - 1.7.0.9-2.3.8.fc19 - Updated to icedtea7 2.3.8 (forest)