automatic import of libtool

1 files changed, 25 insertions, 20 deletions

diff --git a/libtool.spec b/libtool.spec
index cd917c1..2594b4b 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -1,17 +1,17 @@
 %undefine _hardened_build
+%global  gcc_major  7.3.0
 
 Name:    libtool
-Version: 2.5.2
-Release: 1
-License: GPL-2.0-or-later AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-2.0-or-later WITH Libtool-exception AND LGPL-2.0-or-later WITH Libtool-exception AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND MIT AND FSFAP AND FSFULLR AND FSFULLRWD AND GFDL-1.3-or-later AND X11
+Version: 2.4.7
+Release: 4
+License: GPL-2.0-or-later AND LGPL-2.0-or-later and GFDL-1.3-or-later
 Summary: The GNU Portable Library Tool
 URL:     https://www.gnu.org/software/libtool/
-Source0: https://alpha.gnu.org/gnu/libtool/%{name}-%{version}.tar.xz
+Source0: https://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
 
-Patch0: libtool-2.5.1-rpath.patch
-%undefine _hardened_build
-Patch1: libtool-2.4.7-hardening.patch
-Patch2: libtool-2.4.6-disable-lto-link-order2.patch
+Patch0:  libtool-2.4.5-rpath.patch
+Patch1:  libtool-2.4.6-disable-lto-link-order2.patch
+Patch6000:	backport-tests-link-order.at-avoid-warning-and-test-failure.patch
 
 Requires: gcc(major),autoconf, automake, sed, tar, findutils
 
@@ -24,8 +24,8 @@ Libtool hides the complexity of using shared libraries behind a consistent, port
 
 %package ltdl
 Summary: Runtime libraries for GNU Libtool Dynamic Module Loader
-License: LGPL-2.1-or-later
 Provides: %{name}-libs = %{version}-%{release}
+License: LGPL-2.1-or-later
 
 %description ltdl
 The libtool-ltdl package contains the GNU Libtool Dynamic Module Loader, a
@@ -33,11 +33,11 @@ library that provides a consistent, portable interface which simplifies the
 process of using dynamic modules.
 
 %package   devel
-Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader
-License: LGPL-2.1-or-later
-Requires: automake
-Requires: %{name}-ltdl = %{version}-%{release}
-Provides: %{name}-ltdl-devel = %{version}-%{release}
+Summary:   Tools needed for development using the GNU Libtool Dynamic Module Loader
+License:   LGPL-2.0-or-later
+Requires:  automake
+Requires:  %{name}-ltdl = %{version}-%{release}
+Provides:  %{name}-ltdl-devel = %{version}-%{release}
 Obsoletes: %{name}-ltdl-devel < %{version}-%{release}
 
 %description devel
@@ -47,7 +47,6 @@ Static libraries and header files for development with ltdl.
 
 %prep
 %autosetup -n libtool-%{version} -p1
-
 # Fix libtool to pass -Wl,xxx options before libraries
 sed -i \
    -e 's,$libobjs $deplibs $compiler_flags,$compiler_flags $libobjs $deplibs,' \
@@ -62,17 +61,21 @@ export F77=gfortran
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export FFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g')
 export FCFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g')
-%ifarch x86_64 riscv64
+%ifarch x86_64
 export FFLAGS="$RPM_OPT_FLAGS -fPIE"
 export FCFLAGS="$RPM_OPT_FLAGS -fPIE"
 %endif
+%ifarch riscv64
+export FFLAGS="$RPM_OPT_FLAGS -fPIC"
+export FCFLAGS="$RPM_OPT_FLAGS -fPIC"
+%endif
 
 %configure
 
 %make_build CUSTOM_LTDL_CFLAGS="%_hardening_cflags" CUSTOM_LTDL_LDFLAGS="%_hardening_ldflags"
 
 %check
-%make_build check VERBOSE=yes
+make check VERBOSE=yes
 
 %install
 %make_install
@@ -103,13 +106,15 @@ rm -f %{buildroot}%{_infodir}/dir
 
 %files help
 %doc README
-%{_infodir}/*
+%{_infodir}/libtool.info*
 %{_mandir}/man1/libtool.1*
 %{_mandir}/man1/libtoolize.1*
 
+
 %changelog
-* Thu Sep 26 2024 Funda Wang <fundawang@yeah.net> - 2.5.2-1
-- update to 2.5.3
+* Thu Sep 26 2024 Funda Wang <fundawang@yeah.net> - 2.4.7-4
+- pass -Wl,xxx options before libraries
+- disable LTO for link-order2 test
 
 * Tue Jun 06 2023 laokz <zhangkai@iscas.ac.cn> - 2.4.7-3
 - add -fPIC to fortran flags for riscv