rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.25,1.26

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24097

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.10.b09
- Copied javaws.desktop and javaws.png to appropriate place.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- java-1.6.0-openjdk.spec	28 Apr 2008 16:56:08 -0000	1.25
+++ java-1.6.0-openjdk.spec	28 Apr 2008 17:08:18 -0000	1.26
@@ -341,8 +341,6 @@
 cp %{SOURCE7} .
 cp %{SOURCE8} jconsole.desktop
 cp %{SOURCE9} policytool.desktop
-cp icedtea6-%{icedteaver}/javaws.desktop .
-cp icedtea6-%{icedteaver}/javaws.png .
 
 %build
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
@@ -473,6 +471,11 @@
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
 done
 
+# Install javaws desktop file.
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
+cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
 
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
@@ -510,13 +513,6 @@
   | sed 's|^|%doc |' \
   >> %{name}-demo.files
 
-# Install javaws desktop file.
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
-cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -726,6 +722,8 @@
   --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \
   %{priority}
 
+exit 0
+
 %postun javadoc
 if [ $1 -eq 0 ]
 then
@@ -748,6 +746,8 @@
     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
 fi
 
+exit 0
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION