rpms/java-1.7.0-icedtea/devel .cvsignore, 1.14, 1.15 java-1.7.0-icedtea.spec, 1.34, 1.35 sources, 1.21, 1.22 java-1.7.0-icedtea-makefile.patch, 1.3, NONE

[Lillian Angel (langel)]

Author: langel

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

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Removed Files:
	java-1.7.0-icedtea-makefile.patch 
Log Message:
* Thu Dec 13 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.23.b24.snapshot
- Updated icedteaver.
- Updated Release.
- Updated buildoutputdir.
- Removed openjdkdate.
- Updated openjdkver.
- Updated openjdkzip and fedorazip.
- Added Requires: jpackage-utils.
- Removed java-1.7.0-makefile.patch.
- Updated patch list.
- Resolves rhbz#411941
- Resolves rhbz#399221
- Resolves rhbz#318621




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	5 Dec 2007 16:15:20 -0000	1.14
+++ .cvsignore	14 Dec 2007 22:04:56 -0000	1.15
@@ -1,5 +1,5 @@
 java-access-bridge-1.19.2.tar.gz
 mauve-2007-09-12.tar.gz
-icedtea-1.4-05d27d2749e5a499b2770b5fa003a18fa1da3420.tar.gz
-openjdk-7-ea-src-b23-30_oct_2007-fedora.zip
 mauve_tests
+openjdk-b24-fedora.zip
+icedtea-1.5.tar.gz


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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- java-1.7.0-icedtea.spec	7 Dec 2007 02:41:58 -0000	1.34
+++ java-1.7.0-icedtea.spec	14 Dec 2007 22:04:56 -0000	1.35
@@ -3,11 +3,10 @@
 # java-1.7.0-icedtea-devel.
 %define gcjbootstrap 0
 
-%define icedteaver 1.4
-%define icedteasnapshot -05d27d2749e5a499b2770b5fa003a18fa1da3420
+%define icedteaver 1.5
+%define icedteasnapshot %{nil}
 %define icedtearelease snapshot
-%define openjdkver b23
-%define openjdkdate 30_oct_2007
+%define openjdkver b24
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.7.0-icedtea/
 
@@ -18,8 +17,8 @@
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
-%define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
-%define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
+%define openjdkzip openjdk-%{openjdkver}.zip
+%define fedorazip  openjdk-%{openjdkver}-fedora.zip
 
 %define mauvedate 2007-09-12
 
@@ -40,7 +39,7 @@
 %define archinstall ppc
 %endif
 
-%define buildoutputdir openjdk/control/build/linux-%{archbuild}
+%define buildoutputdir openjdk/build/linux-%{archbuild}
 
 %if %{gcjbootstrap}
 %define icedteaopt %{nil}
@@ -104,7 +103,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.22.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.23.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -122,9 +121,8 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
-Patch0:   java-1.7.0-icedtea-makefile.patch
-Patch1:   java-1.7.0-icedtea-win32.patch
-Patch2:   java-1.7.0-icedtea-jhat.patch
+Patch0:   java-1.7.0-icedtea-win32.patch
+Patch1:   java-1.7.0-icedtea-jhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -164,6 +162,8 @@
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
 Requires: openssl
+# Require jpackage-utils for ant
+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.
@@ -279,7 +279,6 @@
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
-%patch0
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 cp %{SOURCE7} .
@@ -289,13 +288,13 @@
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 pushd openjdk-ecj
+  patch -l -p1 < %{PATCH0}
   patch -l -p1 < %{PATCH1}
-  patch -l -p1 < %{PATCH2}
 popd
 %endif
 make stamps/patch.stamp
+patch -l -p0 < %{PATCH0}
 patch -l -p0 < %{PATCH1}
-patch -l -p0 < %{PATCH2}
 make
 pushd java-access-bridge-%{accessver}
   export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
@@ -745,6 +744,20 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Dec 13 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.23.b24.snapshot
+- Updated icedteaver.
+- Updated Release.
+- Updated buildoutputdir.
+- Removed openjdkdate.
+- Updated openjdkver.
+- Updated openjdkzip and fedorazip.
+- Added Requires: jpackage-utils.
+- Removed java-1.7.0-makefile.patch.
+- Updated patch list.
+- Resolves rhbz#411941
+- Resolves rhbz#399221
+- Resolves rhbz#318621
+
 * Thu Dec  6 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.22.b23.snapshot
 - Clear bootstrap mode on ppc and ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Dec 2007 16:15:20 -0000	1.21
+++ sources	14 Dec 2007 22:04:56 -0000	1.22
@@ -1,5 +1,5 @@
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
-7f1ef52fb380c4d7e6feeeb343957c99  icedtea-1.4-05d27d2749e5a499b2770b5fa003a18fa1da3420.tar.gz
-92ac63bb25c47e356cac5e397965d091  openjdk-7-ea-src-b23-30_oct_2007-fedora.zip
 b033e04481030ff85547c0e6aa9a260f  mauve_tests
+254bfa2360efb5374439f9b1738c7b22  openjdk-b24-fedora.zip
+f15bc8b6b3d2f4861c4cc489d2103d97  icedtea-1.5.tar.gz


--- java-1.7.0-icedtea-makefile.patch DELETED ---