Release 21 (by relup.sh)

[packages/libtool.git] / libtool.spec

diff --git a/libtool.spec b/libtool.spec
index b5d83c9f6402a21ce2068e1ad5d9eb17bcbab36d..99f5a258931deef43ce920d75ba65e63ae98775e 100644 (file)
--- a/libtool.spec
+++ b/libtool.spec
@@ -1,3 +1,8 @@
+#
+# Conditional build:
+%bcond_without tests           # "make check"
+%bcond_without tests_expensive # expensive tests
+
 Summary:       GNU libtool, a shared library generation tool
 Summary(es.UTF-8):     GNU libtool, una herramienta de creación de bibliotecas compartidas
 Summary(pl.UTF-8):     GNU libtool - narzędzie do generowania bibliotek współdzielonych
@@ -5,24 +10,26 @@ Summary(pt_BR.UTF-8):        GNU libtool, uma ferramenta de geração de bibliotecas co
 Summary(ru.UTF-8):     GNU libtool, набор утилит для генерации разделяемых библиотек
 Summary(uk.UTF-8):     GNU libtool, набір утиліт для генерації динамічних бібліотек
 Name:          libtool
-Version:       2.4.2
-Release:       8
+Version:       2.4.6
+Release:       21
 Epoch:         2
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       http://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.xz
-# Source0-md5: 2ec8997e0c07249eb4cbd072417d70fe
+# Source0-md5: 1bfb9b923f2c1339b4d2ce1807064aa5
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5: b95e215961860c66f0868b0d551358c9
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-relink.patch
-Patch2:                %{name}-libdirs.patch
-Patch3:                %{name}-multilib.patch
-Patch4:                %{name}-linking-order.patch
+Patch1:                %{name}-libdirs.patch
+Patch2:                %{name}-multilib.patch
+Patch3:                %{name}-linking-order.patch
+Patch4:                %{name}-fuse-ld.patch
+Patch5:                %{name}-libx32.patch
 URL:           http://www.gnu.org/software/libtool/
 BuildRequires: /usr/bin/which
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11.1
+BuildRequires: help2man
 BuildRequires: libstdc++-devel >= 5:3.3.3
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
@@ -147,14 +154,14 @@ utilizando componentes estáticos (raramente necessário).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
-%{__aclocal} -I libltdl/m4
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-
 cd libltdl
-%{__aclocal} -I m4
+%{__aclocal} -I ../m4
 %{__autoconf}
 %{__automake}
 cd ..
@@ -165,15 +172,17 @@ cd ..
 # POSIX sh, not just the ones having extensions (like "+=" operator) that
 # shell used to build libtool package had.
 %{__sed} -i 's/lt_shell_append=yes/lt_shell_append=no/' configure
-%configure
+%configure \
+       --disable-silent-rules
 
 %{__make}
 
+%{?with_tests:%{__make} check GCJ= %{!?with_tests_expensive:TESTSUITEFLAGS='-k "!expensive"'}}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}
-
 %{__make} install \
+       INSTALL="install -p" \
        DESTDIR=$RPM_BUILD_ROOT
 
 # decompress only "ja" manuals; English ones are back in upstream
@@ -199,20 +208,28 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/libtool
 %attr(755,root,root) %{_bindir}/libtoolize
 %dir %{_datadir}/libtool
-%dir %{_datadir}/libtool/config
-%attr(755,root,root) %{_datadir}/libtool/config/compile
-%attr(755,root,root) %{_datadir}/libtool/config/config.guess
-%attr(755,root,root) %{_datadir}/libtool/config/config.sub
-%attr(755,root,root) %{_datadir}/libtool/config/depcomp
-%attr(755,root,root) %{_datadir}/libtool/config/install-sh
-%attr(755,root,root) %{_datadir}/libtool/config/ltmain.sh
-%attr(755,root,root) %{_datadir}/libtool/config/missing
 # libltdl copy for libtoolize --ltdl
-%dir %{_datadir}/libtool/libltdl
-%{_datadir}/libtool/libltdl/[!c]*
-%{_datadir}/libtool/libltdl/config-h.in
-%attr(755,root,root) %{_datadir}/libtool/libltdl/configure
-%{_datadir}/libtool/libltdl/configure.ac
+%dir %{_datadir}/libtool/build-aux
+%attr(755,root,root) %{_datadir}/libtool/build-aux/compile
+%attr(755,root,root) %{_datadir}/libtool/build-aux/config.guess
+%attr(755,root,root) %{_datadir}/libtool/build-aux/config.sub
+%attr(755,root,root) %{_datadir}/libtool/build-aux/depcomp
+%attr(755,root,root) %{_datadir}/libtool/build-aux/install-sh
+%attr(755,root,root) %{_datadir}/libtool/build-aux/ltmain.sh
+%attr(755,root,root) %{_datadir}/libtool/build-aux/missing
+%{_datadir}/libtool/COPYING.LIB
+%{_datadir}/libtool/README
+%{_datadir}/libtool/Makefile*
+%{_datadir}/libtool/aclocal.m4
+%{_datadir}/libtool/config-h.in
+%attr(755,root,root) %{_datadir}/libtool/configure
+%{_datadir}/libtool/configure.ac
+%{_datadir}/libtool/lt*.c
+%{_datadir}/libtool/ltdl.h
+%{_datadir}/libtool/ltdl.mk
+%{_datadir}/libtool/slist.c
+%{_datadir}/libtool/libltdl
+%{_datadir}/libtool/loaders
 %{_mandir}/man1/libtool.1*
 %{_mandir}/man1/libtoolize.1*
 %lang(ja) %{_mandir}/ja/man1/libtool.1*
@@ -234,8 +251,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libltdl.so
 %{_libdir}/libltdl.la
 %{_includedir}/libltdl
+%{_aclocaldir}/ltargz.m4
 %{_includedir}/ltdl.h
-%{_aclocaldir}/argz.m4
 %{_aclocaldir}/ltdl.m4
 
 %files -n libltdl-static