5 changed files with 80 additions and 45 deletions
--- a/libtool-exit-verbosely-for-fatal-configure-problems.patch
+++ b/libtool-exit-verbosely-for-fatal-configure-problems.patch
@ -10,12 +10,14 @@ shell code.
 func_fatal_error call.

 Copyright-paperwork-exempt: Yes
+
+Upstream: 350082b6aa89f9ef603fcebbb4cf33f15a743f2f
 ---
 build-aux/ltmain.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 0ad021d..c3058f2 100644
+index 0ad021db..c3058f21 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
@@ -212,7 +212,7 @@ fi
@ -28,4 +30,5 @@ index 0ad021d..c3058f2 100644
       "Fatal configuration error."
 }
 -- 
-1.8.3.1
+2.17.1
+
--- a/libtool-2.4.6-hardening.patch
+++ b/libtool-2.4.6-hardening.patch
@ -0,0 +1,14 @@
+diff --git a/Makefile.am b/Makefile.am
+index 13dfc63..5c5603a 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -311,6 +311,9 @@ libtool: $(ltmain_sh) $(config_status) $(dotversion)
+ 
+ include libltdl/ltdl.mk
+ 
+libltdl_libltdl_la_CPPFLAGS += $(CUSTOM_LTDL_CFLAGS)
+libltdl_libltdl_la_LDFLAGS  += $(CUSTOM_LTDL_LDFLAGS)
+
+ lt_aclocal_m4	= $(srcdir)/$(ltdl_dir)/aclocal.m4
+ lt_config_h_in	= $(srcdir)/$(ltdl_dir)/config-h.in
+ lt_configure	= $(srcdir)/$(ltdl_dir)/configure
--- a/libtool-fix-GCC-linking-with-specs.patch
+++ b/libtool-fix-GCC-linking-with-specs.patch
@ -1,7 +1,7 @@
 From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001
 From: Pavel Raiskup <praiskup@redhat.com>
 Date: Fri, 18 Sep 2015 10:36:43 +0200
-Subject: [PATCH] libtool: fix GCC linking with -specs=*
+Subject: libtool: fix GCC linking with -specs=*

 References:
 https://bugzilla.redhat.com/show_bug.cgi?id=985592
@ -33,4 +33,5 @@ index d5cf07a..0c40da0 100644
 	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
 -- 
-1.8.3.1
+cgit v1.0-41-gc330
+
--- a/libtool-nodocs.patch
+++ b/libtool-nodocs.patch
@ -0,0 +1,40 @@
+diff -up libtool-2.4.6/Makefile.in.nodocs libtool-2.4.6/Makefile.in
+--- libtool-2.4.6/Makefile.in.nodocs	2017-04-21 12:46:20.704300023 +0200
+++ libtool-2.4.6/Makefile.in	2017-04-21 12:46:42.696840234 +0200
+@@ -313,12 +313,11 @@ MAKEINFOHTML = $(MAKEINFO) --html
+ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
+ DVIPS = dvips
+ RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+-	ctags-recursive dvi-recursive html-recursive info-recursive \
+-	install-data-recursive install-dvi-recursive \
+-	install-exec-recursive install-html-recursive \
+-	install-info-recursive install-pdf-recursive \
+-	install-ps-recursive install-recursive installcheck-recursive \
+-	installdirs-recursive pdf-recursive ps-recursive \
+	ctags-recursive \
+	install-data-recursive \
+	install-exec-recursive \
+	install-recursive installcheck-recursive \
+	installdirs-recursive \
+ 	tags-recursive uninstall-recursive
+ am__can_run_installinfo = \
+   case $$AM_UPDATE_INFO_DIR in \
+@@ -361,8 +360,7 @@ am__define_uniq_tagged_files = \
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-am__DIST_COMMON = $(dist_man1_MANS) $(doc_libtool_TEXINFOS) \
+-	$(srcdir)/Makefile.in $(srcdir)/config-h.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \
+ 	$(srcdir)/libltdl/ltdl.mk $(top_srcdir)/build-aux/compile \
+ 	$(top_srcdir)/build-aux/config.guess \
+ 	$(top_srcdir)/build-aux/config.sub \
+@@ -1973,7 +1971,7 @@ info: info-recursive
+ info-am: $(INFO_DEPS)
+ 
+ install-data-am: install-data-local install-includeHEADERS \
+-	install-info-am install-ltdlincludeHEADERS install-man
+	install-ltdlincludeHEADERS
+ 
+ install-dvi: install-dvi-recursive
+ 
--- a/libtool.spec
+++ b/libtool.spec
@ -3,43 +3,41 @@

 Name:    libtool
 Version: 2.4.6
-Release: 34
-License: GPLv2+ and LGPLv2+ and GFDL-1.3-or-later
+Release: 29
+License: GPLv2+ and LGPLv2+ and GFDL
 Summary: The GNU Portable Library Tool
 URL:     http://www.gnu.org/software/libtool/
 Source0:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz

-Patch0:     libtool-2.4.5-rpath.patch
-Patch1:     libtool-2.4.6-am-1.16-test.patch
-Patch6000:  libtool-exit-verbosely-for-fatal-configure-problems.patch
-Patch6001:  libtool-fix-GCC-linking-with-specs.patch
+Patch0:   libtool-2.4.5-rpath.patch
+Patch1:   libtool-2.4.6-am-1.16-test.patch
+Patch2:   libtool-2.4.6-specs.patch
+Patch3:   libtool-2.4.6-hardening.patch
+Patch4:   libtool-2.4.6-fatal-handler.patch
+Patch5:   libtool-nodocs.patch

 Requires: gcc(major),autoconf, automake, sed, tar, findutils

-BuildRequires: texinfo autoconf automake help2man gdb
-BuildRequires: libstdc++-devel gcc-gfortran gcc gcc-c++
+BuildRequires: texinfo,autoconf, automake,help2man
+BuildRequires: libstdc++-devel, gcc-gfortran,gcc, gcc-c++
+
+
+Provides:  %{name}-ltdl
+Obsoletes: %{name}-ltdl

 %description
 GNU libtool is a generic library support script.
 Libtool hides the complexity of using shared libraries behind a consistent, portable interface.

-%package ltdl
-Summary:  Runtime libraries for GNU Libtool Dynamic Module Loader
-Provides: %{name}-libs = %{version}-%{release}
-
-%description ltdl
-The libtool-ltdl package contains the GNU Libtool Dynamic Module Loader, a
-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:   LGPLv2+
 Requires:  automake
-Requires:  %{name}-ltdl = %{version}-%{release}
+Requires:  %{name} = %{version}-%{release}
 Provides:  %{name}-ltdl-devel
 Obsoletes: %{name}-ltdl-devel

+
 %description devel
 Static libraries and header files for development with ltdl.

@ -57,10 +55,6 @@ 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
-export FFLAGS="$RPM_OPT_FLAGS -fPIE"
-export FCFLAGS="$RPM_OPT_FLAGS -fPIE"
-%endif

 %configure

@ -76,17 +70,15 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}

 %files
 %license COPYING
+%license libltdl/COPYING.LIB
 %doc AUTHORS NEWS THANKS TODO ChangeLog*
 %{_bindir}/libtool
 %{_bindir}/libtoolize
+%{_libdir}/libltdl.so.*
 %{_datadir}/aclocal/*.m4
 %dir %{_datadir}/libtool
 %{_datadir}/libtool/build-aux

-%files ltdl
-%license libltdl/COPYING.LIB
-%{_libdir}/libltdl.so.*
-
 %files devel
 %license libltdl/COPYING.LIB
 %doc libltdl/README
@ -104,21 +96,6 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}


 %changelog
-* Fri Apr 22 2022 renhongxun <renhongxun@h-partners.com> - 2.4.6-34
- update license from GFDL to GFDL-1.3-or-later
-
-* Sat May 29 2021 shixuantong <shixuantong@huawei.com> - 2.4.6-33
- fix F77 language support, Fortran language support, Libtool stress test fail on standard_x86_64 
-
-* Thu Mar 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-32
- add necessary BuildRequires
-
-* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-31
- fixbug in wrong dependency of kernel-devel
-
-* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-30
- format patches
-
 * Thu Sep 5 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-29
 - Package init