[java-1.7.0-openjdk/f17] Partial sync with f18 - Added fix for RH857717, owned /etc/.java/ and /etc/.java/.systemPrefs - Adde

[jiri vanek]

commit b7e8dda73105254b6e03a1e0dfbfd4511c279910
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Jun 5 15:00:40 2013 +0200

    Partial sync with f18
    - Added fix for RH857717, owned /etc/.java/ and /etc/.java/.systemPrefs
    - Added client/server directories so they can be owned

 java-1.7.0-openjdk.spec |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index d8971dc..b709e94 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -152,7 +152,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.5%{?dist}
+Release: %{icedtea_version}.6%{?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
@@ -968,6 +968,10 @@ popd
 
 pushd %{buildoutputdir}/j2sdk-image
 
+#install jsa directories so we can owe them
+mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/
+mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/
+
   # Install main files.
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
   cp -a bin include lib src.zip $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
@@ -1077,6 +1081,10 @@ for e in jconsole policytool ; do
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
 done
 
+# Install /etc/.java/.systemPrefs/ directory
+# See https://bugzilla.redhat.com/show_bug.cgi?id=741821
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
+
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
   | grep -v jre/lib/security \
@@ -1353,6 +1361,10 @@ exit 0
 %attr(664, root, root) %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/server/classes.jsa
 %attr(664, root, root) %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/client/classes.jsa
 %endif
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/
+%{_sysconfdir}/.java/
+%{_sysconfdir}/.java/.systemPrefs
 
 
 %files devel
@@ -1427,6 +1439,10 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Wed Jun  2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.6.fc17
+- Added fix for RH857717, owned /etc/.java/ and /etc/.java/.systemPrefs
+- Added client/server directories so they can be owned
+
 * Thu May 22 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.5.fc17
 - added variable arm_arches as restriction to some cases of not jit_arches
 - size_t patch adapted to 2.3 which is now default on all except arm arches