- isl 0.13 fix and branch diff update, release 2

diff --git a/gcc-nodebug.patch b/gcc-nodebug.patch
index 09ca5a91a490ef73e2af286a966ec99e6aeafd0a..934fcaa011a05c15e78e1ce11ef8f4d6a28cc73a 100644 (file)
--- a/gcc-nodebug.patch
+++ b/gcc-nodebug.patch
@@ -43,7 +43,7 @@
           sys\$$library:trace.exe \
 --- gcc-4.7.1/libada/Makefile.in.orig  2012-06-12 17:12:37.000000000 +0200
 +++ gcc-4.7.1/libada/Makefile.in       2012-07-12 18:27:53.482408144 +0200
           sys\$$library:trace.exe \
 --- gcc-4.7.1/libada/Makefile.in.orig  2012-06-12 17:12:37.000000000 +0200
 +++ gcc-4.7.1/libada/Makefile.in       2012-07-12 18:27:53.482408144 +0200

-@@ -53,7 +53,7 @@
+@@ -59,7 +59,7 @@

  CFLAGS=-g
  PICFLAG = @PICFLAG@
  GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
  CFLAGS=-g
  PICFLAG = @PICFLAG@
  GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc

diff --git a/gcc.spec b/gcc.spec
index d8c45e050ff6db4243c02581a4fec45496b48109..d3e76dd17436d5ce1e28fcd26733250bf2870130 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -94,7 +94,7 @@ Summary(pl.UTF-8):    Kolekcja kompilatorów GNU: kompilator C i pliki współdziel
 Summary(pt_BR.UTF-8):  Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
 Version:       %{major_ver}.%{minor_ver}
 Summary(pt_BR.UTF-8):  Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
 Version:       %{major_ver}.%{minor_ver}

-Release:       1
+Release:       2

 Epoch:         6
 License:       GPL v3+
 Group:         Development/Languages
 Epoch:         6
 License:       GPL v3+
 Group:         Development/Languages


@@ -113,7 +113,9 @@ Patch2:             %{name}-nodebug.patch
 Patch3:                %{name}-ada-link.patch
 Patch4:                %{name}-libjava-multilib.patch
 Patch5:                %{name}-enable-java-awt-qt.patch
 Patch3:                %{name}-ada-link.patch
 Patch4:                %{name}-libjava-multilib.patch
 Patch5:                %{name}-enable-java-awt-qt.patch

-Patch6:        %{name}-install-libffi.patch
+Patch6:                %{name}-install-libffi.patch
+Patch7:                gcc-4.9-isl-0.13-hack.patch
+Patch100:      %{name}-branch.diff

 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf >= 2.64
 %{?with_tests:BuildRequires:   autogen}
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf >= 2.64
 %{?with_tests:BuildRequires:   autogen}


@@ -1678,6 +1680,8 @@ Ten pakiet zawiera 32-bitową wersję statycznej biblioteki GNU Atomic.
 %if %{with gcc_libffi}
 %patch6 -p0
 %endif
 %if %{with gcc_libffi}
 %patch6 -p0
 %endif

+%patch7 -p1
+%patch100 -p0

 
 mv ChangeLog ChangeLog.general
 
 
 mv ChangeLog ChangeLog.general