rpms/java-1.7.0-icedtea/devel .cvsignore, 1.2, 1.3 Makefile, 1.1, 1.2 java-1.7.0-icedtea-makefile.patch, 1.1, 1.2 java-1.7.0-icedtea.spec, 1.3, 1.4 sources, 1.2, 1.3 generate-cacerts.pl, 1.1, NONE

Fri Sep 7 20:07:01 UTC 2007

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305

Modified Files:
	.cvsignore Makefile java-1.7.0-icedtea-makefile.patch 
	java-1.7.0-icedtea.spec sources 
Removed Files:
	generate-cacerts.pl 
Log Message:
* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Do not require openssl for build.
- Require openssl.
- Set gcjbootstrap to 0.
- Remove generate-cacerts.pl.
- Update icedtearelease.
- Update icedteasnapshot.
- Update openjdkver.
- Update openjdkdate.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	28 Aug 2007 14:56:44 -0000	1.2
+++ .cvsignore	7 Sep 2007 20:06:27 -0000	1.3
@@ -1,3 +1,3 @@
-icedtea-1.3-a9c9ee1b6479a84f2153be67fce85b0dbf371398.tar.gz
+icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 java-access-bridge-1.19.2.tar.gz
-openjdk-7-ea-src-b18-16_aug_2007-fedora.zip
+openjdk-7-ea-src-b19-30_aug_2007-fedora.zip


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	28 Aug 2007 14:24:02 -0000	1.1
+++ Makefile	7 Sep 2007 20:06:27 -0000	1.2
@@ -3,6 +3,9 @@
 NAME := java-1.7.0-icedtea
 SPECFILE = $(firstword $(wildcard *.spec))
 
+TARGET_ARCH = $(shell rpm --eval "%{_arch}" | sed 's/i.86/i586/')
+MOCKARGS = --arch $(TARGET_ARCH)
+
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef

java-1.7.0-icedtea-makefile.patch:

Index: java-1.7.0-icedtea-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.7.0-icedtea-makefile.patch	28 Aug 2007 14:56:44 -0000	1.1
+++ java-1.7.0-icedtea-makefile.patch	7 Sep 2007 20:06:27 -0000	1.2
@@ -1,9 +1,10 @@
---- Makefile.am.orig	2007-08-27 14:14:11.000000000 -0400
-+++ Makefile.am	2007-08-27 14:14:27.000000000 -0400
-@@ -122,15 +122,6 @@
+diff -urN ../icedtea-1.4.orig/Makefile.am ./Makefile.am
+--- ../icedtea-1.4.orig/Makefile.am	2007-09-06 19:09:50.000000000 -0400
++++ ./Makefile.am	2007-09-06 19:12:49.000000000 -0400
+@@ -113,15 +113,6 @@
+ endif
  
- download.stamp:
- 	rm -f download.stamp
+ stamps/download.stamp:
 -	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 -	  | $(MD5SUM) --check ; \
 -	then \
@@ -13,15 +14,16 @@
 -          fi ; \
 -	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
 -	fi
- 	touch download.stamp
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
  
- clean-download:
---- Makefile.in.orig	2007-08-27 14:14:16.000000000 -0400
-+++ Makefile.in	2007-08-27 14:14:34.000000000 -0400
-@@ -643,15 +643,6 @@
+diff -urN ../icedtea-1.4.orig/Makefile.in ./Makefile.in
+--- ../icedtea-1.4.orig/Makefile.in	2007-09-06 19:10:07.000000000 -0400
++++ ./Makefile.in	2007-09-06 19:12:55.000000000 -0400
+@@ -646,15 +646,6 @@
+ 	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
  
- download.stamp:
- 	rm -f download.stamp
+ stamps/download.stamp:
 -	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 -	  | $(MD5SUM) --check ; \
 -	then \
@@ -31,6 +33,6 @@
 -          fi ; \
 -	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
 -	fi
- 	touch download.stamp
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
  
- clean-download:


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.7.0-icedtea.spec	5 Sep 2007 21:19:51 -0000	1.3
+++ java-1.7.0-icedtea.spec	7 Sep 2007 20:06:27 -0000	1.4
@@ -1,14 +1,13 @@
 # If gcjbootstrap is 1 IcedTea is bootstrapped against
 # java-1.5.0-gcj-devel.  If gcjbootstrap is 0 IcedTea is built against
-# java-1.7.0-icedtea-devel.  Building against java-1.7.0-icedtea-devel
-# is not supported yet.
-%define gcjbootstrap 1
+# java-1.7.0-icedtea-devel.
+%define gcjbootstrap 0
 
-%define icedteaver 1.3
-%define icedteasnapshot -a9c9ee1b6479a84f2153be67fce85b0dbf371398
+%define icedteaver 1.4
+%define icedteasnapshot -f23640f520cf248e08d731f91fed62ed14e97b2f
 %define icedtearelease snapshot
-%define openjdkver b18
-%define openjdkdate 16_aug_2007
+%define openjdkver b19
+%define openjdkdate 30_aug_2007
 
 %define genurl http://icedtea.classpath.org/hg/fedora/raw-file/32c44002d507/
 
@@ -107,10 +106,9 @@
 # Save icedtea.classpath.org space and bandwidth.
 # NoSource: 1
 Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
-Source3:  %{genurl}generate-cacerts.pl
-Source4:  %{genurl}generate-fedora-zip.sh
-Source5:  README.src
-Source6:  README.plugin
+Source3:  %{genurl}generate-fedora-zip.sh
+Source4:  README.src
+Source5:  README.plugin
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -140,13 +138,14 @@
 BuildRequires: libbonobo-devel
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: xorg-x11-utils
-# Certificate file generation requirements.
-BuildRequires: openssl
 # gcjwebplugin build requirements.
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 
+# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
+# cacerts.
+Requires: openssl
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -262,16 +261,19 @@
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
+cp %{SOURCE4} .
 cp %{SOURCE5} .
-cp %{SOURCE6} .
 
 %build
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
-make patch-ecj.stamp patch.stamp
+%if %{gcjbootstrap}
+make stamps/patch-ecj.stamp
 pushd openjdk-ecj
   patch -p1 < %{PATCH1}
   patch -p1 < %{PATCH2}
 popd
+%endif
+make stamps/patch.stamp
 patch -p0 < %{PATCH1}
 patch -p0 < %{PATCH2}
 make
@@ -368,10 +370,6 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
 cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# Generate and install cacerts file.
-%{__perl} %{SOURCE3} %{buildoutputdir}/j2sdk-image/bin/keytool
-install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
   | grep -v jre/lib/security \
@@ -716,6 +714,16 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Do not require openssl for build.
+- Require openssl.
+- Set gcjbootstrap to 0.
+- Remove generate-cacerts.pl.
+- Update icedtearelease.
+- Update icedteasnapshot.
+- Update openjdkver.
+- Update openjdkdate.
+
 * Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Rename javadoc master alternative javadocdir.
 - Resolves: rhbz#269901


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Aug 2007 14:56:44 -0000	1.2
+++ sources	7 Sep 2007 20:06:27 -0000	1.3
@@ -1,3 +1,3 @@
-d4fff908a9a9fe1dedfe7e9544132ba3  icedtea-1.3-a9c9ee1b6479a84f2153be67fce85b0dbf371398.tar.gz
+1b38ccd941b666b12856a4bc6de6d508  icedtea-1.4-f23640f520cf248e08d731f91fed62ed14e97b2f.tar.gz
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
-6c14ade20274f189be1646223f7e8929  openjdk-7-ea-src-b18-16_aug_2007-fedora.zip
+d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip


--- generate-cacerts.pl DELETED ---


