[java-1.7.0-openjdk/f18] Partial sync with f19 - Added client/server directories so they can be owned - More usage of uniques

Wed Jun 5 13:04:32 UTC 2013

commit 2bb9ec1f7c3f8f1845cfadb076606b0fdf49d0ac
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Jun 5 15:04:03 2013 +0200

    Partial sync with f19
    - Added client/server directories so they can be owned
    - More usage of uniquesuffix
    - Added fix for RH857717, owned /etc/.java/ and /etc/.java/.systemPrefs

 java-1.7.0-openjdk.spec |   46 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 32 insertions(+), 14 deletions(-)
---

diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index b3816a2..be890f8 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -156,7 +156,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.7%{?dist}
+Release: %{icedtea_version}.8%{?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
@@ -594,8 +594,8 @@ The OpenJDK API documentation.
 %global source_num 0
 %endif
 
-%setup -q -c -n %{name} -T -a %{source_num}
-%setup -q -n %{name} -T -D -a 1
+%setup -q -c -n %{uniquesuffix} -T -a %{source_num}
+%setup -q -n %{uniquesuffix} -T -D -a 1
 cp %{SOURCE2} .
 
 # OpenJDK patches
@@ -636,7 +636,7 @@ tar xzf %{SOURCE6}
 
 for file in tapset/*.in; do
 
-    OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
+    OUTPUT_FILE=`echo $file | sed -e s:%{javaver}\.stp\.in$:%{version}-%{release}.stp:g`
     sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/amd64/server/libjvm.so:g $file > $OUTPUT_FILE
     sed -i -e '/@ABS_CLIENT_LIBJVM_SO@/d' $OUTPUT_FILE
     sed -i -e s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir}:g $OUTPUT_FILE
@@ -974,6 +974,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}
@@ -983,7 +987,7 @@ pushd %{buildoutputdir}/j2sdk-image
 %ifarch %{jit_arches}
   # Install systemtap support files.
   install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset
-  cp -a $RPM_BUILD_DIR/%{name}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/
+  cp -a $RPM_BUILD_DIR/%{uniquesuffix}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/
   install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}
   pushd $RPM_BUILD_ROOT%{tapsetdir}
     RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
@@ -1078,11 +1082,16 @@ done
 # Install desktop files.
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
 for e in jconsole policytool ; do
-    sed -i "s/#ARCH#/%{_arch}/g" $e.desktop
-    desktop-file-install --vendor=%{name} --mode=644 \
+    sed -i "s/#ARCH#/%{_arch}-%{release}/g" $e.desktop
+    sed -i "s|/usr/bin|%{sdkbindir}/|g" $e.desktop
+    desktop-file-install --vendor=%{uniquesuffix} --mode=644 \
         --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 \
@@ -1330,9 +1339,9 @@ exit 0
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
-%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
-%doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
+%doc %{_jvmdir}/%{sdkdir}/ASSEMBLY_EXCEPTION
+%doc %{_jvmdir}/%{sdkdir}/LICENSE
+%doc %{_jvmdir}/%{sdkdir}/THIRD_PARTY_README
 %dir %{_jvmdir}/%{sdkdir}
 %{_jvmdir}/%{jrelnk}
 %{_jvmjardir}/%{jrelnk}
@@ -1359,13 +1368,17 @@ 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
 %defattr(-,root,root,-)
-%doc %{buildoutputdir}/j2sdk-image/ASSEMBLY_EXCEPTION
-%doc %{buildoutputdir}/j2sdk-image/LICENSE
-%doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README
+%doc %{_jvmdir}/%{sdkdir}/ASSEMBLY_EXCEPTION
+%doc %{_jvmdir}/%{sdkdir}/LICENSE
+%doc %{_jvmdir}/%{sdkdir}/THIRD_PARTY_README
 %dir %{_jvmdir}/%{sdkdir}/bin
 %dir %{_jvmdir}/%{sdkdir}/include
 %dir %{_jvmdir}/%{sdkdir}/lib
@@ -1420,7 +1433,7 @@ exit 0
 
 %files demo -f %{name}-demo.files
 %defattr(-,root,root,-)
-%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
+%doc %{_jvmdir}/%{sdkdir}/LICENSE
 
 %files src
 %defattr(-,root,root,-)
@@ -1433,6 +1446,11 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Wed Jun 05 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.8.fc18
+- Added client/server directories so they can be owned
+- More usage of uniquesuffix
+- Added fix for RH857717, owned /etc/.java/ and /etc/.java/.systemPrefs
+
 * Thu May 22 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.7.fc18
 - 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
