rpms/gcc/F-12 fastjar-0.97-len1.patch, NONE, 1.1 .cvsignore, 1.317, 1.318 gcc.spec, 1.100, 1.101 sources, 1.324, 1.325

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23284

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	fastjar-0.97-len1.patch 
Log Message:
4.4.2-20

fastjar-0.97-len1.patch:
 jartool.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fastjar-0.97-len1.patch ---
2009-12-21  Chris Ball  <cjb at laptop.org>

	* jartool.c (add_file_to_jar): Test write return value against -1
	instead of 1.

--- fastjar-0.97/jartool.c.jj	2008-10-15 12:35:37.000000000 -0400
+++ fastjar-0.97/jartool.c	2009-12-22 06:48:09.309530000 -0500
@@ -1257,7 +1257,7 @@ int add_file_to_jar(int jfd, int ffd, co
       exit_on_error("write");
 
   /* write the file name to the zip file */
-  if (1 == write(jfd, fname, file_name_length))
+  if (-1 == write(jfd, fname, file_name_length))
     exit_on_error("write");
 
   if(verbose){


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- .cvsignore	17 Dec 2009 20:07:54 -0000	1.317
+++ .cvsignore	22 Dec 2009 11:57:45 -0000	1.318
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.2-20091217.tar.bz2
+gcc-4.4.2-20091222.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gcc.spec	17 Dec 2009 20:07:54 -0000	1.100
+++ gcc.spec	22 Dec 2009 11:57:46 -0000	1.101
@@ -1,12 +1,16 @@
-%global DATE 20091217
-%global SVNREV 155325
+%global DATE 20091222
+%global SVNREV 155395
 %global gcc_version 4.4.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 18
+%global gcc_release 20
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
+%if 0%{?fedora} >= 13
+%global include_gappletviewer 0
+%else
 %global include_gappletviewer 1
+%endif
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
 %global build_ada 1
 %else
@@ -164,6 +168,7 @@ Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-rh546017.patch
 
 Patch1000: fastjar-0.97-segfault.patch
+Patch1001: fastjar-0.97-len1.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -348,7 +353,9 @@ Requires: libart_lgpl >= 2.1.0
 %if %{build_java}
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: glib2-devel >= 2.4.0
+%if %{include_gappletviewer}
 BuildRequires: xulrunner-devel
+%endif
 BuildRequires: libart_lgpl-devel >= 2.1.0
 BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel
@@ -475,6 +482,7 @@ rm libjava/testsuite/libjava.lang/PR3502
 tar xzf %{SOURCE4}
 
 %patch1000 -p0 -b .fastjar-0.97-segfault~
+%patch1001 -p0 -b .fastjar-0.97-len1~
 
 %if %{bootstrap_java}
 tar xjf %{SOURCE10}
@@ -613,7 +621,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`
 %if !%{build_java}
 	--disable-libgcj \
 %else
-	--enable-java-awt=gtk --disable-dssi --enable-plugin \
+	--enable-java-awt=gtk --disable-dssi \
+%if %{include_gappletviewer}
+	--enable-plugin \
+%endif
 	--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
 	--enable-libgcj-multifile \
 %if !%{bootstrap_java}
@@ -1853,6 +1864,14 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Dec 22 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-20
+- fix MEM_SIZE of reload created stack slots (#548825,
+  PR rtl-optimization/42429)
+%if !%{include_gappletviewer}
+- remove gappletviewer, gcjwebplugin and related files for F13 (#548783)
+%endif
+- fix addition of one character long filenames in fastjar (#549493)
+
 * Thu Dec 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.2-18
 - update from gcc-4_4-branch
   - PRs c++/42387


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- sources	17 Dec 2009 20:07:54 -0000	1.324
+++ sources	22 Dec 2009 11:57:46 -0000	1.325
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-1bac2d18babfc08d9c27d488ffd75cc4  gcc-4.4.2-20091217.tar.bz2
+190cf32f4e2f3e5261cda2ba32be0912  gcc-4.4.2-20091222.tar.bz2