!2 format patches

Merge pull request !2 from lvying6/dev

libtool-2.4.6-hardening.patch

@@ -1,14 +0,0 @@
-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

libtool-exit-verbosely-for-fatal-configure-problems.patch

@@ -10,14 +10,12 @@ 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 0ad021db..c3058f21 100644
+index 0ad021d..c3058f2 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
 @@ -212,7 +212,7 @@ fi
@@ -30,5 +28,4 @@ index 0ad021db..c3058f21 100644
        "Fatal configuration error."
  }
 -- 
-2.17.1
+1.8.3.1
-

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: libtool: fix GCC linking with -specs=*
+Subject: [PATCH] libtool: fix GCC linking with -specs=*
 
 References:
 https://bugzilla.redhat.com/show_bug.cgi?id=985592
@@ -33,5 +33,4 @@ index d5cf07a..0c40da0 100644
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
 -- 
-cgit v1.0-41-gc330
+1.8.3.1
-

libtool-nodocs.patch

@@ -1,40 +0,0 @@
-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
- 

libtool.spec

@@ -3,18 +3,16 @@
 
 Name:    libtool
 Version: 2.4.6
-Release: 29
+Release: 30
 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
+Patch0:     libtool-2.4.5-rpath.patch
-Patch1:   libtool-2.4.6-am-1.16-test.patch
+Patch1:     libtool-2.4.6-am-1.16-test.patch
-Patch2:   libtool-2.4.6-specs.patch
+Patch6000:  libtool-exit-verbosely-for-fatal-configure-problems.patch
-Patch3:   libtool-2.4.6-hardening.patch
+Patch6001:  libtool-fix-GCC-linking-with-specs.patch
-Patch4:   libtool-2.4.6-fatal-handler.patch
-Patch5:   libtool-nodocs.patch
 
 Requires: gcc(major),autoconf, automake, sed, tar, findutils
 
@@ -96,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
 
 
 %changelog
+* 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