[packages/libtool] - fix conflict with gnulib - rel 2

[baggins]

commit f563f4f0ab8e1d4f8fc7d3185e91d71e46687b54
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 17 21:20:17 2014 +0100

    - fix conflict with gnulib
    - rel 2

 libtool-gnulib.patch | 32 ++++++++++++++++++++++++++++++++
 libtool.spec         |  4 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/libtool.spec b/libtool.spec
index b2c4441..2bb8a62 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -11,7 +11,7 @@ Summary(ru.UTF-8):	GNU libtool, набор утилит для генераци
 Summary(uk.UTF-8):	GNU libtool, набір утиліт для генерації динамічних бібліотек
 Name:		libtool
 Version:	2.4.3
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL v2+
 Group:		Development/Tools
@@ -25,6 +25,7 @@ Patch2:		%{name}-multilib.patch
 Patch3:		%{name}-linking-order.patch
 Patch4:		%{name}-fuse-ld.patch
 Patch5:		%{name}-tests.patch
+Patch6:		%{name}-gnulib.patch
 URL:		http://www.gnu.org/software/libtool/
 BuildRequires:	/usr/bin/which
 BuildRequires:	autoconf >= 2.59
@@ -154,6 +155,7 @@ utilizando componentes estáticos (raramente necessário).
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__aclocal} -I m4
diff --git a/libtool-gnulib.patch b/libtool-gnulib.patch
new file mode 100644
index 0000000..5d7c071
--- /dev/null
+++ b/libtool-gnulib.patch
@@ -0,0 +1,32 @@
+These snippet/ headers are installed by gnulib, not libtool.  There's no
+reason libtool should be trying to delete these for us (and will break
+projects), so drop that logic.
+
+People who are using gnulib can use gnulib to update/manage these.
+
+* libtoolize.in (func_require_seen_libtool): Delete snippet/ header files
+from $all_pkgaux_files.
+
+Signed-off-by: Mike Frysinger <vapier at gentoo.org>
+---
+ libtoolize.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtoolize.in b/libtoolize.in
+index d819470..d0cbfb0 100644
+--- a/libtoolize.in
++++ b/libtoolize.in
+@@ -1897,7 +1897,7 @@ func_require_seen_libtool ()
+   # Do not remove config.guess, config.sub or install-sh, we don't
+   # install them without --install, and the project may not be using
+   # Automake.
+-  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
++  all_pkgaux_files="compile depcomp missing ltmain.sh"
+   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
+   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
+ 
+-- 
+2.1.2
+
+
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libtool.git/commitdiff/f563f4f0ab8e1d4f8fc7d3185e91d71e46687b54