rpms/libsilc/F-9 libsilc.spec, 1.21, 1.22 silc-toolkit-1.1-wordsize.patch, 1.2, 1.3

[Stu Tomlinson]

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22208/F-9

Modified Files:
	libsilc.spec silc-toolkit-1.1-wordsize.patch 
Log Message:
- Fix the patch to make headers multilib safe, which fixes connecting
  to servers (#459578)



Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-9/libsilc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libsilc.spec	20 Mar 2008 18:15:54 -0000	1.21
+++ libsilc.spec	23 Aug 2008 17:18:44 -0000	1.22
@@ -1,24 +1,23 @@
 Summary: SILC Client Library
 Name:    libsilc
 Version: 1.1.7
-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
-Source1: libsilc-filter-provides.sh
 Patch0:  silc-toolkit-1.1-wordsize.patch
 Patch1:  silc-toolkit-1.1.5-libidn.patch
 Patch2:  silc-toolkit-1.1.5-docinst.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libidn-devel
 BuildRequires: libtool, autoconf, automake
-# Epoch: 0
-%define _use_internal_dependency_generator 0
-%define __find_provides %{SOURCE1}
 
 %description
-SILC Client Library libraries for SILC clients.
+SILC Client Library libraries for clients to connect to SILC networks.
+
+SILC (Secure Internet Live Conferencing) is a protocol which provides
+secure conferencing services on the Internet over insecure channel.
 
 %package devel
 Summary: Headers and shared libraries for %{name}
@@ -44,6 +43,17 @@
 %patch1 -p1 -b .libidn
 %patch2 -p1 -b .docinst
 
+# filter out libsilc module SONAME Provides (#245323)
+cat << \EOF > %{name}-prov
+#!/bin/sh
+sed -e '\,/silc/modules/,d' |\
+%{__find_provides} $*
+EOF
+
+%define _use_internal_dependency_generator 0
+%define __find_provides %{_builddir}/silc-toolkit-%{version}/%{name}-prov
+chmod +x %{__find_provides}
+
 %build
 autoreconf
 %configure --libdir=%{_libdir} --enable-shared \
@@ -82,9 +92,6 @@
 mv CREDITS CREDITS.orig
 iconv -f iso-8859-15 -t utf8 -o CREDITS CREDITS.orig
 
-# Ensure that libsilc-filter-provides.sh is executable
-chmod 755 %{SOURCE1}
-
 %check
 # If this fails, the filter-provides script needs an update.
 [ -d $RPM_BUILD_ROOT%{_libdir}/silc/modules ]
@@ -124,6 +131,17 @@
 
 
 %changelog
+* Sat Aug 23 2008 Stu Tomlinson <stu at nosnilmot.com> 1.1.7-2
+- Fix the patch to make headers multilib safe, which fixes connecting
+  to servers (#459578)
+
+* Wed Aug 20 2008 Stu Tomlinson <stu at nosnilmot.com> 1.1.7-2
+- Address package review issues (#224458):
+  Remove unnecessary direct dependency on libdl from libsilcclient
+  Link libsilcclient against libsilc
+  Make provides filtering more robust
+  Update description
+
 * Thu Mar 20 2008 Stu Tomlinson <stu at nosnilmot.com> 1.1.7-1
 - Update to 1.1.7, fixes buffer overflow in PKCS#1 message decoding (#438382)
 

silc-toolkit-1.1-wordsize.patch:

Index: silc-toolkit-1.1-wordsize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/F-9/silc-toolkit-1.1-wordsize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- silc-toolkit-1.1-wordsize.patch	26 Jan 2008 15:21:52 -0000	1.2
+++ silc-toolkit-1.1-wordsize.patch	23 Aug 2008 17:18:44 -0000	1.3
@@ -6,7 +6,7 @@
  AC_SUBST(SILC_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long)
  AC_CHECK_SIZEOF(long, 0)
 -AC_SUBST(SILC_SIZEOF_LONG, $ac_cv_sizeof_long)
-+AC_SUBST(SILC_SIZEOF_LONG, __WORDSIZE)
++AC_SUBST(SILC_SIZEOF_LONG, "(__WORDSIZE / 8)")
  AC_CHECK_SIZEOF(int, 0)
  AC_SUBST(SILC_SIZEOF_INT, $ac_cv_sizeof_int)
  AC_CHECK_SIZEOF(short, 0)
@@ -15,7 +15,7 @@
  AC_SUBST(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char)
  AC_CHECK_SIZEOF(void *, 0)
 -AC_SUBST(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p)
-+AC_SUBST(SILC_SIZEOF_VOID_P, __WORDSIZE)
++AC_SUBST(SILC_SIZEOF_VOID_P, "(__WORDSIZE / 8)")
  AC_CHECK_TYPES(long long)
  AC_CHECK_TYPES(long double)