- updated to 2.18.50.0.6.

[packages/binutils.git] / binutils.spec

diff --git a/binutils.spec b/binutils.spec
index ebd90abe663d057d743adad5168c1db15152f316..72464c92c4e4748875a0ecb5c00142a220b4d551 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_with    allarchs        # enable all targets
 # define addtargets x,y,z      # build with additional targets x,y,z (e.g. x86_64-linux)
+%bcond_without pax             # without PaX flags (for upstream bugreports)
 #
 Summary:       GNU Binary Utility Development Utilities
 Summary(de.UTF-8):     GNU Binary Utility Development Utilities
@@ -13,13 +14,13 @@ Summary(ru.UTF-8):  Набор инструментов GNU для построе
 Summary(tr.UTF-8):     GNU geliştirme araçları
 Summary(uk.UTF-8):     Набір інструментів GNU для побудови виконуваних програм
 Name:          binutils
-Version:       2.17.50.0.15
+Version:       2.18.50.0.6
 Release:       1
 Epoch:         3
-License:       GPL
+License:       GPL v3+
 Group:         Development/Tools
 Source0:       ftp://ftp.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2
-# Source0-md5: e38e3da86030d2ccc0f30f12841263d4
+# Source0-md5: 9e474d739355c15ba6ecf5fd9fae8608
 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
@@ -42,7 +43,6 @@ BuildRequires:        perl-tools-pod
 BuildRequires: sparc32
 %endif
 BuildRequires: texinfo >= 4.2
-Requires(post,postun): /sbin/ldconfig
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Conflicts:     gcc-c++ < 5:3.3
 Conflicts:     modutils < 2.4.17
@@ -145,7 +145,7 @@ niektórych pakietów.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+%{?with_pax:%patch3 -p1}
 %patch4 -p0
 %patch5 -p1
 %patch6 -p1
@@ -154,12 +154,15 @@ niektórych pakietów.
 
 %build
 # non-standard regeneration (needed because of gasp patch)
-cd gas
-aclocal
-automake --cygnus Makefile
-automake --cygnus doc/Makefile
-autoconf
-cd ..
+# AM_BINUTILS_WARNINGS in bfd/warning.m4, ZW_GNU_GETTEXT_SISTER_DIR in config/gettext-sister.m4
+for dir in gas bfd; do
+       cd $dir || exit 1
+       aclocal -I ../bfd -I ../config -I ..
+       automake --cygnus Makefile
+       automake --cygnus doc/Makefile
+       autoconf
+       cd ..
+done
 
 # More targets
 TARGETS=
@@ -228,6 +231,8 @@ install libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
 # remove evil -L pointing inside builder's home
 perl -pi -e 's@-L[^ ]*/pic @@g' $RPM_BUILD_ROOT%{_libdir}/libbfd.la
 
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %find_lang bfd
 %find_lang binutils
 %find_lang gas
@@ -240,20 +245,20 @@ cat gas.lang gprof.lang ld.lang >> %{name}.lang
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post  -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun        -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%post devel
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post devel    -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun devel
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun devel  -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)