rpms/java-1.7.0-icedtea/devel .cvsignore, 1.7, 1.8 java-1.7.0-icedtea.spec, 1.8, 1.9 sources, 1.6, 1.7

[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-serv26629

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Log Message:
* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
- Removed jtreg. Does not adhere to Fedora guidelines.






Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Sep 2007 20:51:55 -0000	1.7
+++ .cvsignore	26 Sep 2007 19:19:37 -0000	1.8
@@ -2,4 +2,3 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
-jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
+++ java-1.7.0-icedtea.spec	26 Sep 2007 19:19:37 -0000	1.9
@@ -20,7 +20,6 @@
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
-%define jtregzip jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip
 
 %define mauvedate 2007-09-12
 
@@ -114,7 +113,6 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
-Source8:  %{jtregzip}
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -148,8 +146,6 @@
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
-# jtreg testing requirements.
-BuildRequires: xorg-x11-server-Xvfb
 
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
@@ -302,22 +298,10 @@
   echo ====================MAUVE TESTING========================
   %{expand: 
      $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
-	 -showpasses -debug -timeout 30000 2>&1
-   } || :
+	 -showpasses -debug -timeout 30000 2>&1 || :
+   }
   echo ====================MAUVE TESTING END====================
 popd
-pushd jtreg
-  echo ====================JTREG TESTING========================
-  Xvfb :1 &
-  export DISPLAY=:1.0
-  %{expand: 
-     ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
-	$(pwd)/../openjdk/j2se/test/ 2>&1 
-  } || :
-  killall -9 Xvfb
-  export DISPLAY=:0.0
-  echo ====================JTREG TESTING END====================
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -747,16 +731,19 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Mon Sep 26 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
+- Removed jtreg. Does not adhere to Fedora guidelines.
+
+* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
 - Fixed mauve and jtreg test runs to not break the build when an error is thrown
 
-* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added JTreg zip as source
 - Run JTreg tests after build for smoke testing.
 - Added Xvfb as build requirement.
 
-* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
 - Added Mauve tarball as source.
 - Added mauve_tests as source.
 - Run Mauve after build for regression testing.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Sep 2007 20:51:55 -0000	1.6
+++ sources	26 Sep 2007 19:19:37 -0000	1.7
@@ -3,4 +3,3 @@
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
-cb1d97fa19213fabb0910d4df9705e85  jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip