rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.72,1.73

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2537

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
- Removed all instances of security jars.




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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- java-1.6.0-openjdk.spec	24 Sep 2008 18:19:38 -0000	1.72
+++ java-1.6.0-openjdk.spec	24 Sep 2008 18:58:39 -0000	1.73
@@ -67,14 +67,10 @@
 %define syslibdir       %{_prefix}/lib64
 %define _libdir         %{_prefix}/lib
 %define archname        %{name}.%{_arch}
-%define localpolicy     jce_%{javaver}_%{origin}_local_policy.%{_arch}
-%define uspolicy        jce_%{javaver}_%{origin}_us_export_policy.%{_arch}
 %define javaplugin      libjavaplugin.so.%{_arch}
 %else
 %define syslibdir       %{_libdir}
 %define archname        %{name}
-%define localpolicy     jce_%{javaver}_%{origin}_local_policy
-%define uspolicy        jce_%{javaver}_%{origin}_us_export_policy
 %define javaplugin      libjavaplugin.so
 %endif
 
@@ -451,13 +447,6 @@
 
   # Install JCE policy symlinks.
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla
-  for file in local_policy.jar US_export_policy.jar
-  do
-    mv -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/$file \
-      $RPM_BUILD_ROOT%{_jvmprivdir}/%{archname}/jce/vanilla
-    # Touch files for ghosts.
-    touch $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/$file
-  done
 
   # Install versionless symlinks.
   pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -603,17 +592,6 @@
   --slave %{_jvmjardir}/jre-%{javaver} \
   jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
 
-alternatives \
-  --install \
-  %{_jvmdir}/%{jrelnk}/lib/security/local_policy.jar \
-  %{localpolicy} \
-  %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar \
-  %{priority} \
-  --slave \
-  %{_jvmdir}/%{jrelnk}/lib/security/US_export_policy.jar \
-  %{uspolicy} \
-  %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
-
 # Update for jnlp handling.
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
@@ -630,9 +608,6 @@
   alternatives --remove java %{jrebindir}/java
   alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
   alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
-  alternatives --remove \
-    %{localpolicy} \
-    %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar
 fi
 
 # Update for jnlp handling.
@@ -809,8 +784,6 @@
 %{_jvmdir}/%{jredir}/lib/security/cacerts
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
-%ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
-%ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
 %{_datadir}/applications/*policytool.desktop
 %{_datadir}/icons/hicolor/*x*/apps/java.png
 %{_mandir}/man1/java-%{name}.1*
@@ -896,6 +869,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
+- Removed all instances of security jars.
+
 * Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b12
 - Updated icedteasnapshot.
 - Updated release.