rpms/java-1.6.0-openjdk/devel .cvsignore, 1.20, 1.21 java-1.6.0-openjdk.spec, 1.30, 1.31 sources, 1.19, 1.20 java-1.6.0-openjdk-jconsole.desktop, 1.1, NONE java-1.6.0-openjdk-policytool.desktop, 1.1, NONE

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv567

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Removed Files:
	java-1.6.0-openjdk-jconsole.desktop 
	java-1.6.0-openjdk-policytool.desktop 
Log Message:
* Tue Apr 29 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.12.b09
- Updated icedteasnapshot.
- Removed java-1.6.0-openjdk-jconsole.desktop and
java-1.6.0-openjdk-policytool.desktop files.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	28 Apr 2008 22:00:27 -0000	1.20
+++ .cvsignore	29 Apr 2008 16:41:11 -0000	1.21
@@ -1,5 +1,5 @@
-icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz
 java-access-bridge-1.22.0.tar.gz
 mauve-2008-03-11.tar.gz
 mauve_tests
 openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
+icedtea6-1.2-d0081b7856c8d986658a48828f3f74b937353413.tar.gz


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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- java-1.6.0-openjdk.spec	29 Apr 2008 16:14:57 -0000	1.30
+++ java-1.6.0-openjdk.spec	29 Apr 2008 16:41:11 -0000	1.31
@@ -4,7 +4,7 @@
 %define gcjbootstrap 0
 
 %define icedteaver 1.2
-%define icedteasnapshot -0bdd2917dfdb672402a7868206fd4ce9b2690a8c
+%define icedteasnapshot -d0081b7856c8d986658a48828f3f74b937353413
 %define openjdkver b09
 %define openjdkdate 11_apr_2008
 
@@ -137,8 +137,6 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
-Source8:  %{name}-jconsole.desktop
-Source9:  %{name}-policytool.desktop
 # FIXME: This patch needs to be fixed. optflags argument -mtune=generic is being ignored
 # because it breaks several graphical applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
@@ -349,8 +347,6 @@
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 cp %{SOURCE7} .
-cp %{SOURCE8} jconsole.desktop
-cp %{SOURCE9} policytool.desktop
 
 %build
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
@@ -478,16 +474,14 @@
     openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png
 done
-for e in jconsole policytool ; do
-    desktop-file-install --vendor=fedora --mode=644 \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
-done
 
-# Install javaws desktop file.
+# Install jconsole, policytool and javaws desktop files.
 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
+for e in javaws jconsole policytool ; do
+    desktop-file-install --vendor=fedora --mode=644 \
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
+done
 
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
@@ -867,6 +861,11 @@
 
 %changelog
 * Tue Apr 29 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.12.b09
+- Updated icedteasnapshot.
+- Removed java-1.6.0-openjdk-jconsole.desktop and
+java-1.6.0-openjdk-policytool.desktop files.
+
+* Tue Apr 29 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.12.b09
 - Added archbuild and archinstall definitions for ia64 .
 - Resolves: rhbz#433843
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	28 Apr 2008 22:00:27 -0000	1.19
+++ sources	29 Apr 2008 16:41:11 -0000	1.20
@@ -1,5 +1,5 @@
-f0dc22fdc707f4ef5ff6b1ee113ac6a1  icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz
 11d8e6129f27792cc1b0e1a7de2ec127  java-access-bridge-1.22.0.tar.gz
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 ad07a6bf24f81f49b4a8abef03676dd6  openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
+f9aa0067a1add184414aa45e909d1c9d  icedtea6-1.2-d0081b7856c8d986658a48828f3f74b937353413.tar.gz


--- java-1.6.0-openjdk-jconsole.desktop DELETED ---


--- java-1.6.0-openjdk-policytool.desktop DELETED ---