rpms/libsilc/F-13 silc-toolkit-1.1.10-libs.patch, NONE, 1.1 libsilc.spec, 1.31, 1.32 silc-toolkit-1.1.5-libidn.patch, 1.2, NONE

[Stu Tomlinson]

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4338/F-13

Modified Files:
	libsilc.spec 
Added Files:
	silc-toolkit-1.1.10-libs.patch 
Removed Files:
	silc-toolkit-1.1.5-libidn.patch 
Log Message:
- Drop patch to use system libidn now that system libidn hides
  required symbols (#597889)


silc-toolkit-1.1.10-libs.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE silc-toolkit-1.1.10-libs.patch ---
diff -up silc-toolkit-1.1.7/lib/Makefile.am.libs silc-toolkit-1.1.7/lib/Makefile.am
--- silc-toolkit-1.1.7/lib/Makefile.am.libs	2008-03-20 02:43:33.000000000 -0400
+++ silc-toolkit-1.1.7/lib/Makefile.am	2008-06-04 14:18:53.000000000 -0400
@@ -48,8 +48,8 @@ SILC_LINK_LIBS=$(LIBS)
 SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
 SILCSERVER_LIBS=$(LIBS) -lsilc
 else
-SILC_LINK_LIBS=
-SILCCLIENT_LINK_LIBS=
+SILC_LINK_LIBS=$(LIBIDN_LIBS) $(LIBS)
+SILCCLIENT_LINK_LIBS=$(top_builddir)/lib/libsilc.la
 SILCSERVER_LIBS=
 endif
 


Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-13/libsilc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- libsilc.spec	6 Sep 2009 01:42:58 -0000	1.31
+++ libsilc.spec	31 May 2010 01:17:46 -0000	1.32
@@ -1,14 +1,14 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.10
-Release: 1%{dist}
+Release: 2%{dist}
 License: GPLv2 or BSD
 Group:   System Environment/Libraries
 URL:     http://www.silcnet.org/
 Source0: http://www.silcnet.org/download/toolkit/sources/silc-toolkit-%{version}.tar.bz2
 Patch0:  silc-toolkit-1.1-wordsize.patch
-Patch1:  silc-toolkit-1.1.5-libidn.patch
-Patch2:  silc-toolkit-1.1.5-docinst.patch
+Patch1:  silc-toolkit-1.1.5-docinst.patch
+Patch2:  silc-toolkit-1.1.10-libs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
@@ -40,8 +40,8 @@ applications.
 %prep
 %setup -q -n silc-toolkit-%{version}
 %patch0 -p1 -b .wordsize
-%patch1 -p1 -b .libidn
-%patch2 -p1 -b .docinst
+%patch1 -p1 -b .docinst
+%patch2 -p1 -b .libs
 
 # filter out libsilc module SONAME Provides (#245323)
 cat << \EOF > %{name}-prov
@@ -131,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 31 2010 Stu Tomlinson <stu at nosnilmot.com> 1.1.10-2
+- Drop patch to use system libidn now that system libidn hides
+  required symbols (#597889)
+
 * Sun Sep 06 2009 Stu Tomlinson <stu at nosnilmot.com> 1.1.10-1
 - Update to 1.1.10
 


--- silc-toolkit-1.1.5-libidn.patch DELETED ---