rpms/libsilc/devel silc-toolkit-1.1.8-libtool.patch, NONE, 1.1 libsilc.spec, 1.24, 1.25

[Stu Tomlinson]

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22739

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.8-libtool.patch 
Log Message:
Fix building with libtool 2.2


silc-toolkit-1.1.8-libtool.patch:

--- NEW FILE silc-toolkit-1.1.8-libtool.patch ---
diff -up silc-toolkit-1.1.8/lib/Makefile.am.libtool silc-toolkit-1.1.8/lib/Makefile.am
--- silc-toolkit-1.1.8/lib/Makefile.am.libtool	2008-12-23 12:56:45.000000000 -0500
+++ silc-toolkit-1.1.8/lib/Makefile.am	2008-12-23 12:56:59.000000000 -0500
@@ -73,8 +73,8 @@ all:
 
 install-exec-hook:
 	-mkdir -p $(DESTDIR)$(libdir)
-	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
-	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+	-$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 
 LIB_BASE_VERSION=@LIB_BASE_VERSION@
 LIBSILC_CURRENT=@LIBSILC_CURRENT@


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libsilc.spec	3 Dec 2008 16:43:56 -0000	1.24
+++ libsilc.spec	23 Dec 2008 18:15:08 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.8
-Release: 1%{dist}
+Release: 2%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
@@ -9,6 +9,7 @@
 Patch0:  silc-toolkit-1.1-wordsize.patch
 Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
+Patch3:  silc-toolkit-1.1.8-libtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -42,6 +43,7 @@
 %patch0 -p1 -b .wordsize
 %patch1 -p1 -b .libidn
 %patch2 -p1 -b .docinst
+%patch3 -p1 -b .libtool
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -55,8 +57,8 @@
 chmod +x %{__find_provides}
 
 %build
-autoreconf
-%configure --libdir=%{_libdir} --enable-shared \
+autoreconf -i
+%configure --libdir=%{_libdir} --enable-shared --without-libtoolfix \
            --includedir=%{_includedir}/silc --with-simdir=%{_libdir}/silc/modules \
            --docdir=%{_docdir}/%{name}-%{version} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -131,6 +133,9 @@
 
 
 %changelog
+* Tue Dec 23 2008 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-2
+- Fix building with libtool 2.2
+
 * Wed Dec 03 2008 Stu Tomlinson <stu at nosnilmot.com> 1.1.8-1
 - Update to 1.1.8