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

Lillian Angel (langel) fedora-extras-commits at redhat.com
Mon Apr 28 16:56:44 UTC 2008


Author: langel

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

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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- java-1.6.0-openjdk.spec	28 Apr 2008 15:09:36 -0000	1.24
+++ java-1.6.0-openjdk.spec	28 Apr 2008 16:56:08 -0000	1.25
@@ -341,6 +341,8 @@
 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}
@@ -510,11 +512,9 @@
 
 # Install javaws desktop file.
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
-cp %{_sourcedir}/icedtea6-%{icedteaver}/javaws.png \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{_sourcedir}/icedtea6-%{icedteaver}/javaws.desktop
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
 
 
 %clean
@@ -854,6 +854,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* 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.
+
 * Mon Apr 28 2008 Joshua Sumali <jsumali at redhat.com> - 1:1.6.0.0-0.10.b09
 - Added javaws menu entry.
 - Resolves: rhbz#443851




More information about the fedora-extras-commits mailing list