rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-jconsole.desktop, NONE, 1.1 java-1.6.0-openjdk-policytool.desktop, NONE, 1.1 .cvsignore, 1.11, 1.12 java-1.6.0-openjdk-freetype.patch, 1.1, 1.2 java-1.6.0-openjdk-makefile.patch, 1.2, 1.3 java-1.6.0-openjdk-optflags.patch, 1.2, 1.3 java-1.6.0-openjdk.spec, 1.15, 1.16 sources, 1.10, 1.11
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Mon Apr 28 22:04:42 UTC 2008
- Previous message: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-freetype.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 java-1.6.0-openjdk.spec, 1.27, 1.28 sources, 1.18, 1.19
- Next message: rpms/libraw1394/devel libraw1394-juju-munmap-correct-max_packet_size.patch, NONE, 1.1 libraw1394.spec, 1.40, 1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2056/EL-5
Modified Files:
.cvsignore java-1.6.0-openjdk-freetype.patch
java-1.6.0-openjdk-makefile.patch
java-1.6.0-openjdk-optflags.patch java-1.6.0-openjdk.spec
sources
Added Files:
java-1.6.0-openjdk-jconsole.desktop
java-1.6.0-openjdk-policytool.desktop
Log Message:
merge from devel
--- NEW FILE java-1.6.0-openjdk-jconsole.desktop ---
[Desktop Entry]
Name=Java Monitoring & Management Console
Comment=Monitor and manage Java applications
Exec=jconsole
TryExec=jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
Categories=Development;Monitor;Java;
Version=1.0
--- NEW FILE java-1.6.0-openjdk-policytool.desktop ---
[Desktop Entry]
Name=Java Policy Tool
Comment=Manage Java policy files
Exec=policytool
TryExec=policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
Categories=Development;Java;
Version=1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 6 Apr 2008 15:29:42 -0000 1.11
+++ .cvsignore 28 Apr 2008 22:03:58 -0000 1.12
@@ -1,5 +1,5 @@
java-access-bridge-1.22.0.tar.gz
mauve-2008-03-11.tar.gz
mauve_tests
-icedtea6-1.0-0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d.tar.gz
-openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
+icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz
+openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
java-1.6.0-openjdk-freetype.patch:
Index: java-1.6.0-openjdk-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-freetype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk-freetype.patch 6 Apr 2008 15:29:42 -0000 1.1
+++ java-1.6.0-openjdk-freetype.patch 28 Apr 2008 22:04:00 -0000 1.2
@@ -9,3 +9,14 @@
#
# Prune out all known SCM (Source Code Management) directories
+--- icedtea6-1.0/openjdk-ecj/jdk/make/common/shared/Platform.gmk.orig 2008-04-13 18:01:30.000000000 +0200
++++ icedtea6-1.0/openjdk-ecj/jdk/make/common/shared/Platform.gmk 2008-04-13 18:01:40.000000000 +0200
+@@ -94,7 +94,7 @@
+ REQUIRED_BOOT_VER = 1.5
+
+ # If we are using freetype, this is the required version
+-REQUIRED_FREETYPE_VERSION=2.3.0
++REQUIRED_FREETYPE_VERSION=2.2.0
+
+ #
+ # Prune out all known SCM (Source Code Management) directories
java-1.6.0-openjdk-makefile.patch:
Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-makefile.patch 6 Apr 2008 15:29:42 -0000 1.2
+++ java-1.6.0-openjdk-makefile.patch 28 Apr 2008 22:04:00 -0000 1.3
@@ -1,9 +1,11 @@
---- makeorig 2008-03-27 13:34:52.000000000 -0400
-+++ Makefile.am 2008-03-27 13:35:11.000000000 -0400
-@@ -177,15 +177,6 @@
+--- Makefile.am.orig 2008-04-28 10:11:15.000000000 -0400
++++ Makefile.am 2008-04-28 10:12:16.000000000 -0400
+@@ -201,18 +201,6 @@
endif
stamps/download.stamp:
+-if USE_ALT_OPENJDK_SRC_ZIP
+-else
- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
- then \
@@ -13,42 +15,41 @@
- fi ; \
- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
- fi
+-endif
mkdir -p stamps
touch stamps/download.stamp
-@@ -292,8 +283,7 @@
- stamps/extract.stamp: stamps/download.stamp
+@@ -320,7 +308,7 @@
if ! test -d openjdk ; \
then \
-- mkdir openjdk ; \
+ mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
+ $(TAR) xzf $(OPENJDK_SRC_ZIP); \
chmod -R ug+w openjdk ; \
fi
mkdir -p stamps
---- makeinorig 2008-03-27 13:34:58.000000000 -0400
-+++ Makefile.in 2008-03-27 13:35:15.000000000 -0400
-@@ -755,15 +756,6 @@
+--- Makefile.in.orig 2008-04-28 10:11:19.000000000 -0400
++++ Makefile.in 2008-04-28 10:12:19.000000000 -0400
+@@ -788,15 +788,6 @@
mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
stamps/download.stamp:
-- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
-- | $(MD5SUM) --check ; \
-- then \
-- if [ $(OPENJDK_SRC_ZIP) ] ; \
-- then \
-- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
-- fi ; \
-- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
-- fi
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ | $(MD5SUM) --check ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ then \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ if [ $(OPENJDK_SRC_ZIP) ] ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ then \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ fi ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@ fi
mkdir -p stamps
touch stamps/download.stamp
-@@ -792,8 +784,7 @@
- stamps/extract.stamp: stamps/download.stamp
+@@ -826,7 +817,7 @@
if ! test -d openjdk ; \
then \
-- mkdir openjdk ; \
+ mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
+ $(TAR) xzf $(OPENJDK_SRC_ZIP); \
chmod -R ug+w openjdk ; \
java-1.6.0-openjdk-optflags.patch:
Index: java-1.6.0-openjdk-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-optflags.patch 6 Apr 2008 15:29:42 -0000 1.2
+++ java-1.6.0-openjdk-optflags.patch 28 Apr 2008 22:04:00 -0000 1.3
@@ -1,114 +1,3 @@
---- openjdkold/icedtea6/Makefile.am 2008-03-31 13:53:06.000000000 -0400
-+++ Makefile.am 2008-04-01 08:43:45.000000000 -0400
-@@ -94,6 +94,7 @@
- "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
- "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-@@ -144,6 +145,7 @@
- "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
- "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-@@ -278,6 +280,7 @@
- patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch \
- patches/icedtea-jpegclasses.patch \
-+ patches/icedtea-optflags.patch \
- $(GCC_PATCH) \
- $(FAST_BUILD_PATCH) \
- $(DISTRIBUTION_PATCHES)
---- openjdkold/icedtea6/configure.ac 2008-03-31 09:47:41.000000000 -0400
-+++ configure.ac 2008-04-01 08:41:47.000000000 -0400
-@@ -133,6 +133,9 @@
- ])
- AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
-
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+AC_SUBST(ALT_OPT_CFLAGS)
-+
- SET_ARCH_DIRS
- if test "${with_openjdk}" == true
- then
---- openjdkold/icedtea6/Makefile.in 2008-03-31 13:53:10.000000000 -0400
-+++ Makefile.in 2008-04-01 08:44:03.000000000 -0400
-@@ -73,6 +73,7 @@
- ALSA_CFLAGS = @ALSA_CFLAGS@
- ALSA_LIBS = @ALSA_LIBS@
- ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
-+ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
- AMTAR = @AMTAR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -287,6 +288,7 @@
- "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
- "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
-@@ -324,6 +326,7 @@
- "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
- "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
- "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
-@@ -384,7 +387,8 @@
- patches/icedtea-generated.patch patches/icedtea-lib64.patch \
- patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch \
-- patches/icedtea-jpegclasses.patch $(GCC_PATCH) \
-+ patches/icedtea-jpegclasses.patch \
-+ patches/icedtea-optflags.patch $(GCC_PATCH) \
- $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
-
- # Patch OpenJDK for plug replacements and ecj.
---- openjdkold/icedtea6/configure 2008-03-31 12:15:40.000000000 -0400
-+++ configure 2008-04-01 08:44:07.000000000 -0400
-@@ -726,6 +726,7 @@
- WITH_ICEDTEA_FALSE
- WITH_OPENJDK_TRUE
- WITH_OPENJDK_FALSE
-+ALT_OPT_CFLAGS
- BUILD_ARCH_DIR
- INSTALL_ARCH_DIR
- JAVA
-@@ -5591,6 +5592,9 @@
- fi
-
-
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+
-+
-
- case "${host}" in
- x86_64-*-*)
-@@ -12561,6 +12565,7 @@
- WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
- WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim
- WITH_OPENJDK_FALSE!$WITH_OPENJDK_FALSE$ac_delim
-+ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
- BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
- INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
- JAVA!$JAVA$ac_delim
-@@ -12632,7 +12637,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- openjdkold/icedtea6/patches/icedtea-optflags.patch 1969-12-31 19:00:00.000000000 -0500
+++ patches/icedtea-optflags.patch 2008-04-01 08:41:47.000000000 -0400
@@ -0,0 +1,59 @@
@@ -171,3 +60,117 @@
+ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
+ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
+ $(DEFINES) $(OPTIONS:%=-D%)
+--- Makefile.am.orig 2008-04-28 10:02:57.000000000 -0400
++++ Makefile.am 2008-04-28 10:03:58.000000000 -0400
+@@ -96,6 +96,7 @@
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+@@ -159,6 +160,7 @@
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+@@ -308,6 +310,7 @@
+ patches/icedtea-color-createcontext.patch \
+ patches/icedtea-color-profiles.patch \
+ patches/icedtea-fonts.patch \
++ patches/icedtea-optflags.patch \
+ $(GCC_PATCH) \
+ $(DISTRIBUTION_PATCHES)
+
+--- Makefile.in.orig 2008-04-28 10:03:03.000000000 -0400
++++ Makefile.in 2008-04-28 10:04:59.000000000 -0400
+@@ -87,6 +87,7 @@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
++ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
+ AMTAR = @AMTAR@
+ ANT = @ANT@
+ AUTOCONF = @AUTOCONF@
+@@ -306,6 +307,7 @@
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+@@ -346,6 +348,7 @@
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" \
+ "ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+@@ -411,8 +414,8 @@
+ patches/icedtea-LCMS-setTagData.patch \
+ patches/icedtea-color-createcontext.patch \
+ patches/icedtea-color-profiles.patch \
+- patches/icedtea-fonts.patch $(GCC_PATCH) \
+- $(DISTRIBUTION_PATCHES) $(am__append_7)
++ patches/icedtea-fonts.patch patches/icedtea-optflags.patch \
++ $(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
+
+ # Patch OpenJDK for plug replacements and ecj.
+ ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+--- configure.ac.orig 2008-04-28 10:03:16.000000000 -0400
++++ configure.ac 2008-04-28 10:04:44.000000000 -0400
+@@ -22,6 +22,10 @@
+ FIND_TOOL([UNZIP], [unzip])
+ FIND_TOOL([CPIO], [cpio])
+ FIND_TOOL([FILE], [file])
++
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++AC_SUBST(ALT_OPT_CFLAGS)
++
+ AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
+ if test "x$FASTJAR" = x; then
+ AC_MSG_ERROR([Can't find fastjar or jar])
+--- configure.orig 2008-04-28 10:03:09.000000000 -0400
++++ configure 2008-04-28 10:04:48.000000000 -0400
+@@ -717,6 +717,7 @@
+ UNZIP
+ CPIO
+ FILE
++ALT_OPT_CFLAGS
+ FASTJAR
+ ac_ct_FASTJAR
+ GAWK
+@@ -5569,6 +5570,10 @@
+ fi
+
+
++
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++
++
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in fastjar jar
+ do
+@@ -12958,6 +12963,7 @@
+ UNZIP!$UNZIP$ac_delim
+ CPIO!$CPIO$ac_delim
+ FILE!$FILE$ac_delim
++ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
+ FASTJAR!$FASTJAR$ac_delim
+ ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
+ GAWK!$GAWK$ac_delim
+@@ -13044,7 +13050,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- java-1.6.0-openjdk.spec 15 Apr 2008 06:39:42 -0000 1.15
+++ java-1.6.0-openjdk.spec 28 Apr 2008 22:04:00 -0000 1.16
@@ -3,10 +3,10 @@
# java-1.6.0-openjdk-devel.
%define gcjbootstrap 0
-%define icedteaver 1.0
-%define icedteasnapshot -0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d
-%define openjdkver b08
-%define openjdkdate 26_mar_2008
+%define icedteaver 1.2
+%define icedteasnapshot -0bdd2917dfdb672402a7868206fd4ce9b2690a8c
+%define openjdkver b09
+%define openjdkdate 11_apr_2008
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -33,8 +33,13 @@
%define archbuild ppc64
%define archinstall ppc64
%else
+%ifarch %{ix86}
%define archbuild i586
%define archinstall i386
+%else
+%define archbuild zero
+%define archinstall zero
+%endif
%endif
%endif
%endif
@@ -55,7 +60,7 @@
# Hard-code libdir on 64-bit architectures to make the 64-bit JDK
# simply be another alternative.
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
%define syslibdir %{_prefix}/lib64
%define _libdir %{_prefix}/lib
%define archname %{name}.%{_arch}
@@ -78,7 +83,7 @@
# Standard JPackage directories and symbolic links.
# Make 64-bit JDKs just another alternative on 64-bit architectures.
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
%define sdklnk java-%{javaver}-%{origin}.%{_arch}
%define jrelnk jre-%{javaver}-%{origin}.%{_arch}
%define sdkdir %{name}-%{version}.%{_arch}
@@ -90,7 +95,7 @@
%define jredir %{sdkdir}/jre
%define sdkbindir %{_jvmdir}/%{sdklnk}/bin
%define jrebindir %{_jvmdir}/%{jrelnk}/bin
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
%define jvmjardir %{_jvmjardir}/%{name}-%{version}.%{_arch}
%else
%define jvmjardir %{_jvmjardir}/%{name}-%{version}
@@ -101,7 +106,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.7.%{openjdkver}%{?dist}.2
+Release: 0.12.%{openjdkver}%{?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
@@ -127,6 +132,8 @@
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
@@ -140,6 +147,7 @@
BuildRequires: alsa-lib-devel
BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
BuildRequires: giflib-devel
%if %{?fedora}0
BuildRequires: lesstif-devel
@@ -169,7 +177,7 @@
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-fonts-Type1
BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype-devel
+BuildRequires: freetype-devel >= 2.2.0
BuildRequires: fontconfig
# Java Access Bridge for GNOME build requirements.
BuildRequires: at-spi-devel
@@ -181,8 +189,8 @@
BuildRequires: gecko-devel
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
-# zero-assembler build requirement
-%ifarch ppc ppc64
+# Zero-assembler build requirement
+%ifnarch x86_64 %{ix86}
BuildRequires: libffi-devel
%endif
@@ -191,13 +199,19 @@
# cacerts.
Requires: openssl
# Require jpackage-utils for ant
-Requires: jpackage-utils
+Requires: jpackage-utils >= 1.7.3-1jpp.3
# Require zoneinfo data provided by tzdata-java subpackage.
Requires: tzdata-java
# Post requires alternatives to install tool alternatives.
Requires(post): %{_sbindir}/alternatives
# Postun requires alternatives to uninstall tool alternatives.
Requires(postun): %{_sbindir}/alternatives
+# Post requires update-desktop-database to update desktop database
+# for jnlp files.
+Requires(post): %{_bindir}/update-desktop-database
+# Postun requires update-desktop-database to update desktop database
+# for jnlp files.
+Requires(postun): %{_bindir}/update-desktop-database
# java-1.6.0-openjdk replaces java-1.7.0-icedtea
Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
@@ -330,6 +344,8 @@
cp %{SOURCE4} .
cp %{SOURCE5} .
cp %{SOURCE7} .
+cp %{SOURCE8} jconsole.desktop
+cp %{SOURCE9} policytool.desktop
%build
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
@@ -450,6 +466,23 @@
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# Install icons and menu entries
+for s in 16 24 32 48 ; do
+ install -D -p -m 644 \
+ 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 -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 \
| grep -v jre/lib/security \
@@ -497,6 +530,7 @@
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
+ --slave %{_bindir}/javaws javaws %{jrebindir}/javaws \
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
--slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
--slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
@@ -550,6 +584,16 @@
%{uspolicy} \
%{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
+# Update for jnlp handling.
+update-desktop-database -q %{_datadir}/applications || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+exit 0
+
%postun
if [ $1 -eq 0 ]
then
@@ -561,6 +605,16 @@
%{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar
fi
+# Update for jnlp handling.
+update-desktop-database -q %{_datadir}/applications || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+exit 0
+
%post devel
ext=.gz
alternatives \
@@ -577,7 +631,6 @@
--slave %{_bindir}/javap javap %{sdkbindir}/javap \
--slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
--slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
- --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
--slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \
--slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \
--slave %{_bindir}/jps jps %{sdkbindir}/jps \
@@ -615,8 +668,6 @@
%{_mandir}/man1/jconsole-%{name}.1$ext \
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
%{_mandir}/man1/jdb-%{name}.1$ext \
- --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \
- %{_mandir}/man1/jhat-%{name}.1$ext \
--slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \
%{_mandir}/man1/jinfo-%{name}.1$ext \
--slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \
@@ -660,6 +711,8 @@
--slave %{_jvmjardir}/java-%{javaver} \
java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
+exit 0
+
%postun devel
if [ $1 -eq 0 ]
then
@@ -668,22 +721,30 @@
alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
fi
+exit 0
+
%post javadoc
alternatives \
--install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \
%{priority}
+exit 0
+
%postun javadoc
if [ $1 -eq 0 ]
then
alternatives --remove javadocdir %{_javadocdir}/%{name}/api
fi
+exit 0
+
%post plugin
alternatives \
--install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
%{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so %{priority}
+exit 0
+
%postun plugin
if [ $1 -eq 0 ]
then
@@ -691,6 +752,8 @@
%{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
fi
+exit 0
+
%files -f %{name}.files
%defattr(-,root,root,-)
%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
@@ -716,6 +779,8 @@
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
%ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
+%{_datadir}/applications/*policytool.desktop
+%{_datadir}/icons/hicolor/*x*/apps/java.png
%{_mandir}/man1/java-%{name}.1*
%{_mandir}/man1/keytool-%{name}.1*
%{_mandir}/man1/orbd-%{name}.1*
@@ -726,6 +791,8 @@
%{_mandir}/man1/servertool-%{name}.1*
%{_mandir}/man1/tnameserv-%{name}.1*
%{_mandir}/man1/unpack200-%{name}.1*
+%{_datadir}/pixmaps/javaws.png
+%{_datadir}/applications/javaws.desktop
%files devel
%defattr(-,root,root,-)
@@ -743,6 +810,7 @@
%{_jvmdir}/%{sdkdir}/lib/*
%{_jvmdir}/%{sdklnk}
%{_jvmjardir}/%{sdklnk}
+%{_datadir}/applications/*jconsole.desktop
%{_mandir}/man1/appletviewer-%{name}.1*
%{_mandir}/man1/apt-%{name}.1*
%{_mandir}/man1/extcheck-%{name}.1*
@@ -792,12 +860,50 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
-* Mon Apr 14 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.7.b08.2
-- And now for something completely different...
-- Bootstrap for ppc
+* Mon Apr 28 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.12.b08
+- Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL:
+- Require Freetype 2.2.0 instead of 2.3.0
+- Build against openmotif instead of lesstif when not on Fedora
+
+* Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.11.b09
+- Fixed javaws.desktop and javaws.png installation.
+
+* 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
+
+* Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.10.b09
+- Updated release.
+- Updated icedteasnapshot.
+- Added jconsole and policy menu entries.
+- Removed all jhat references.
+- Resolves: rhbz#435235
+- Resolves: rhbz#417501
+- Resolves: rhbz#437418
+- Resolves: rhbz#443360
+- Resolves: rhbz#304031
+
+* Thu Apr 18 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.9.b09
+- Updated icedteaver.
+- Updated icedteasnapshot.
+- Updated openjdkver.
+- Updated openjdkdate.
+- Updated release.
+- Resolves: rhbz#442602
+- Resolves: rhbz#442514
+- Resolves: rhbz#441437
+- Resolves: rhbz#375541
+
+* Thu Apr 17 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.9.b08
+- Added javaws to /usr/bin.
+- Resolves: rhbz#437929
+
+* Mon Apr 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.8.b08
+- Updated sources.
+- Updated icedteaver.
-* Sun Apr 6 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.7.b08.1
-- Bootstrap for Red Hat Enterprise Linux 5, to include in EPEL
+* Mon Apr 07 2008 Dennis Gilmore <dennis at ausil.us> - 1:1.6.0.0-0.8.b08
+- enable building for all arches using zero where there is not a native port
* Mon Mar 31 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.7.b08
- Updated icedteasnapshot. Includes sources needed to build xmlgraphics-commons.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 6 Apr 2008 15:29:42 -0000 1.10
+++ sources 28 Apr 2008 22:04:00 -0000 1.11
@@ -1,5 +1,5 @@
11d8e6129f27792cc1b0e1a7de2ec127 java-access-bridge-1.22.0.tar.gz
079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz
7a0c160c03012cd40957a7a112e25038 mauve_tests
-0da9ac0f77805fa6da6ebd197f8e7be8 icedtea6-1.0-0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d.tar.gz
-a94e67f3182d49902572153fa86f774e openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
+f0dc22fdc707f4ef5ff6b1ee113ac6a1 icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz
+ad07a6bf24f81f49b4a8abef03676dd6 openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
- Previous message: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-freetype.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 java-1.6.0-openjdk.spec, 1.27, 1.28 sources, 1.18, 1.19
- Next message: rpms/libraw1394/devel libraw1394-juju-munmap-correct-max_packet_size.patch, NONE, 1.1 libraw1394.spec, 1.40, 1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list