- up to 2.31

diff --git a/binutils-am.patch b/binutils-am.patch
deleted file mode 100644 (file)
index f1d1945..0000000
--- a/binutils-am.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- binutils-2.23.51.0.9/gas/doc/Makefile.am.orig      2013-02-04 21:04:42.928606932 +0100
-+++ binutils-2.23.51.0.9/gas/doc/Makefile.am   2013-02-04 21:31:30.648573422 +0100
-@@ -17,7 +17,7 @@
- # <http://www.gnu.org/licenses/>.
- #
- 
--AUTOMAKE_OPTIONS = 1.8 cygnus
-+AUTOMAKE_OPTIONS = 1.8
- 
- # What version of the manual you want; "all" includes everything
- CONFIG=all
---- binutils-2.23.51.0.9/bfd/doc/Makefile.am.orig      2013-02-02 00:24:54.000000000 +0100
-+++ binutils-2.23.51.0.9/bfd/doc/Makefile.am   2013-02-05 19:33:46.556919813 +0100
-@@ -17,7 +17,7 @@
- # <http://www.gnu.org/licenses/>.
- #
- 
--AUTOMAKE_OPTIONS = 1.9 cygnus
-+AUTOMAKE_OPTIONS = 1.9
- 
- DOCFILES = aoutx.texi  archive.texi archures.texi \
-       bfdt.texi  cache.texi coffcode.texi \

diff --git a/binutils-discarded.patch b/binutils-discarded.patch
deleted file mode 100644 (file)
index e16e4cc..0000000
--- a/binutils-discarded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils-2.28/bfd/elflink.c.orig   2017-06-05 22:10:50.459268960 +0200
-+++ binutils-2.28/bfd/elflink.c        2017-06-05 22:30:10.125922386 +0200
-@@ -10420,7 +10420,7 @@
-                     if (action_discarded & COMPLAIN)
-                       (*flinfo->info->callbacks->einfo)
-                         /* xgettext:c-format */
--                        (_("%X`%s' referenced in section `%A' of %B: "
-+                        (_("`%s' referenced in section `%A' of %B: "
-                            "defined in discarded section `%A' of %B\n"),
-                          sym_name, o, input_bfd, sec, sec->owner);
- 

diff --git a/binutils-gasp.patch b/binutils-gasp.patch
index 5d45ee9def9d2f2992984886b4ef82d81e6d2b72..9abbd3266c335da799cabb16bfe9e42ed13b6829 100644 (file)
--- a/binutils-gasp.patch
+++ b/binutils-gasp.patch
@@ -42,12 +42,12 @@
  itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h $(srcdir)/itbl-lex.h
 --- binutils-2.23.51.0.9/gas/doc/Makefile.am.orig      2013-02-02 00:24:54.000000000 +0100
 +++ binutils-2.23.51.0.9/gas/doc/Makefile.am   2013-02-04 21:03:53.135274636 +0100
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ POD2MAN = pod2man --center="GNU Developm
  
  man_MANS = as.1
  
--info_TEXINFOS = as.texinfo
-+info_TEXINFOS = as.texinfo gasp.texinfo
+-info_TEXINFOS = as.texi
++info_TEXINFOS = as.texi gasp.texinfo
  as_TEXINFOS = asconfig.texi $(CPU_DOCS)
  
  AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \

diff --git a/binutils-info.patch b/binutils-info.patch
index b956ff09d283b43de7c25353a5ec1be35d3fe7b8..2d2222adbc549a51028224e8e68dcc43df9bc235 100644 (file)
--- a/binutils-info.patch
+++ b/binutils-info.patch
@@ -1,6 +1,6 @@
-diff -urN binutils-2.24.51.0.4.org/bfd/doc/bfd.texinfo binutils-2.24.51.0.4/bfd/doc/bfd.texinfo
---- binutils-2.24.51.0.4.org/bfd/doc/bfd.texinfo       2014-10-10 21:39:07.000000000 +0200
-+++ binutils-2.24.51.0.4/bfd/doc/bfd.texinfo   2014-10-11 21:34:42.948190928 +0200
+diff -urN binutils-2.24.51.0.4.org/bfd/doc/bfd.texi binutils-2.24.51.0.4/bfd/doc/bfd.texi
+--- binutils-2.24.51.0.4.org/bfd/doc/bfd.texi  2014-10-10 21:39:07.000000000 +0200
++++ binutils-2.24.51.0.4/bfd/doc/bfd.texi      2014-10-11 21:34:42.948190928 +0200
 @@ -5,9 +5,9 @@
  @synindex fn cp
  
@@ -16,7 +16,7 @@ diff -urN binutils-2.24.51.0.4.org/bfd/doc/bfd.texinfo binutils-2.24.51.0.4/bfd/
 diff -urN binutils-2.24.51.0.4.org/binutils/doc/binutils.texi binutils-2.24.51.0.4/binutils/doc/binutils.texi
 --- binutils-2.24.51.0.4.org/binutils/doc/binutils.texi        2014-10-10 21:39:07.000000000 +0200
 +++ binutils-2.24.51.0.4/binutils/doc/binutils.texi    2014-10-11 21:34:45.891625226 +0200
-@@ -22,30 +22,26 @@
+@@ -22,29 +22,25 @@
  @c man end
  @end copying
  
@@ -33,7 +33,6 @@ diff -urN binutils-2.24.51.0.4.org/binutils/doc/binutils.texi binutils-2.24.51.0
 -* c++filt: (binutils)c++filt.   Filter to demangle encoded C++ symbols.
 -* cxxfilt: (binutils)c++filt.     MS-DOS name for c++filt.
 -* dlltool: (binutils)dlltool.   Create files needed to build and use DLLs.
--* nlmconv: (binutils)nlmconv.     Converts object code into an NLM.
 -* nm: (binutils)nm.               List symbols from object files.
 -* objcopy: (binutils)objcopy.   Copy and translate object files.
 -* objdump: (binutils)objdump.     Display information from object files.
@@ -51,7 +50,6 @@ diff -urN binutils-2.24.51.0.4.org/binutils/doc/binutils.texi binutils-2.24.51.0
 +* c++filt: (binutils)c++filt.         Filter to demangle encoded C++ symbols
 +* cxxfilt: (binutils)c++filt.         MS-DOS name for c++filt
 +* dlltool: (binutils)dlltool.         Create files needed to build and use DLLs
-+* nlmconv: (binutils)nlmconv.         Converts object code into an NLM
 +* nm: (binutils)nm.                   List symbols from object files
 +* objcopy: (binutils)objcopy.         Copy and translate object files
 +* objdump: (binutils)objdump.         Display information from object files
@@ -66,9 +64,9 @@ diff -urN binutils-2.24.51.0.4.org/binutils/doc/binutils.texi binutils-2.24.51.0
  @end direntry
  
  @titlepage
-diff -urN binutils-2.24.51.0.4.org/gas/doc/as.texinfo binutils-2.24.51.0.4/gas/doc/as.texinfo
---- binutils-2.24.51.0.4.org/gas/doc/as.texinfo        2014-10-10 21:39:07.000000000 +0200
-+++ binutils-2.24.51.0.4/gas/doc/as.texinfo    2014-10-11 21:34:45.224935691 +0200
+diff -urN binutils-2.24.51.0.4.org/gas/doc/as.texi binutils-2.24.51.0.4/gas/doc/as.texi
+--- binutils-2.24.51.0.4.org/gas/doc/as.texi   2014-10-10 21:39:07.000000000 +0200
++++ binutils-2.24.51.0.4/gas/doc/as.texi       2014-10-11 21:34:45.224935691 +0200
 @@ -86,10 +86,10 @@
  @end ifinfo
  
@@ -98,9 +96,9 @@ diff -urN binutils-2.24.51.0.4.org/gprof/gprof.texi binutils-2.24.51.0.4/gprof/g
  @end direntry
  @end ifnottex
  
-diff -urN binutils-2.24.51.0.4.org/ld/ld.texinfo binutils-2.24.51.0.4/ld/ld.texinfo
---- binutils-2.24.51.0.4.org/ld/ld.texinfo     2014-10-10 21:39:07.000000000 +0200
-+++ binutils-2.24.51.0.4/ld/ld.texinfo 2014-10-11 21:34:45.888291778 +0200
+diff -urN binutils-2.24.51.0.4.org/ld/ld.texi binutils-2.24.51.0.4/ld/ld.texi
+--- binutils-2.24.51.0.4.org/ld/ld.texi        2014-10-10 21:39:07.000000000 +0200
++++ binutils-2.24.51.0.4/ld/ld.texi    2014-10-11 21:34:45.888291778 +0200
 @@ -42,9 +42,9 @@
  @c man end
  

diff --git a/binutils.spec b/binutils.spec
index 46b43930a2362cefe45302330a185602d8606023..76454281015f9d0ea81a9bf1dbf3646ff1af37c2 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -23,13 +23,13 @@ Summary(ru.UTF-8):  Набор инструментов GNU для построе
 Summary(tr.UTF-8):     GNU geliştirme araçları
 Summary(uk.UTF-8):     Набір інструментів GNU для побудови виконуваних програм
 Name:          binutils
-Version:       2.30
+Version:       2.31
 Release:       1
 Epoch:         4
 License:       GPL v3+
 Group:         Development/Tools
 Source0:       http://ftp.gnu.org/gnu/binutils/%{name}-%{version}.tar.lz
-# Source0-md5: e64eb5655c6c2caa78677e19c84ba5b5
+# Source0-md5: 1ea8ddd13bd6fdcab1fe6cf377894476
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6
 Patch0:                %{name}-gasp.patch
@@ -37,13 +37,12 @@ Patch1:             %{name}-info.patch
 Patch2:                %{name}-libtool-relink.patch
 Patch3:                %{name}-pt_pax_flags.patch
 Patch4:                %{name}-libdir.patch
-Patch5:                %{name}-discarded.patch
+
 Patch6:                %{name}-absolute-gnu_debuglink-path.patch
 Patch7:                %{name}-libtool-m.patch
 Patch8:                %{name}-build-id.patch
 Patch9:                %{name}-tooldir.patch
 Patch10:       %{name}-sanity-check.patch
-Patch11:       %{name}-am.patch
 URL:           http://sources.redhat.com/binutils/
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
@@ -78,7 +77,6 @@ Binutils is a collection of binary utilities, including:
 - strings - list printable strings from files,
 - strip - discard symbols,
 - addr2line - convert addresses to file and line,
-- nlmconv - convert object code into an NLM.
 
 %description -l es.UTF-8
 Binutils es una colección de utilitarios necesarios para compilar
@@ -167,13 +165,12 @@ niektórych pakietów.
 %patch2 -p1
 %{?with_pax:%patch3 -p1}
 %patch4 -p1
-%patch5 -p1
+
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 
 # file contains hacks for ac 2.59 only
 %{__rm} config/override.m4
@@ -259,7 +256,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/bfd-plugins
 
 # remove these man pages unless we cross-build for win*/netware platforms.
 # however, this should be done in Makefiles.
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{dlltool,nlmconv,windmc,windres}.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{dlltool,windmc,windres}.1
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -379,6 +376,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/ansidecl.h
 %{_includedir}/bfd.h
 %{_includedir}/bfdlink.h
+%{_includedir}/diagnostics.h
 %{_includedir}/dis-asm.h
 %{_includedir}/plugin-api.h
 %{_includedir}/symcat.h