rpms/libsilc/devel libsilc.spec, 1.21, 1.22 silc-toolkit-1.1.5-libidn.patch, 1.1, 1.2 libsilc-filter-provides.sh, 1.1, NONE

Fri Jun 6 13:51:30 UTC 2008

Author: nosnilmot

Update of /cvs/pkgs/rpms/libsilc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13609

Modified Files:
	libsilc.spec silc-toolkit-1.1.5-libidn.patch 
Removed Files:
	libsilc-filter-provides.sh 
Log Message:
- Address package review issues (#224458):
  Remove unnecessary direct dependency on libdl from libsilcclient
  Link libsilcclient against libsilc
  Make provides filtering more robust
  Update description




Index: libsilc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/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	6 Jun 2008 13:50:43 -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,13 @@
 
 
 %changelog
+* Fri Jun 06 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.5-libidn.patch:

Index: silc-toolkit-1.1.5-libidn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libsilc/devel/silc-toolkit-1.1.5-libidn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- silc-toolkit-1.1.5-libidn.patch	26 Jan 2008 15:21:52 -0000	1.1
+++ silc-toolkit-1.1.5-libidn.patch	6 Jun 2008 13:50:43 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up silc-toolkit-1.1.5/configure.ac.libidn silc-toolkit-1.1.5/configure.ac
---- silc-toolkit-1.1.5/configure.ac.libidn	2007-11-11 07:23:54.000000000 -0500
-+++ silc-toolkit-1.1.5/configure.ac	2008-01-08 09:16:51.000000000 -0500
+diff -up silc-toolkit-1.1.7/configure.ac.libidn silc-toolkit-1.1.7/configure.ac
+--- silc-toolkit-1.1.7/configure.ac.libidn	2008-06-04 14:14:04.000000000 -0400
++++ silc-toolkit-1.1.7/configure.ac	2008-06-04 14:14:04.000000000 -0400
 @@ -221,6 +221,15 @@ AC_CHECK_HEADER(regex.h,
  )
  AM_CONDITIONAL(HAVE_REGEX, test x$have_regex = x1)
@@ -17,9 +17,9 @@
  AC_CHECK_FUNC(getopt_long,
    [
      AC_DEFINE([HAVE_GETOPT_LONG], [], [HAVE_GETOPT_LONG])
-diff -up silc-toolkit-1.1.5/lib/contrib/Makefile.am.libidn silc-toolkit-1.1.5/lib/contrib/Makefile.am
---- silc-toolkit-1.1.5/lib/contrib/Makefile.am.libidn	2007-11-11 07:23:52.000000000 -0500
-+++ silc-toolkit-1.1.5/lib/contrib/Makefile.am	2008-01-08 09:05:38.000000000 -0500
+diff -up silc-toolkit-1.1.7/lib/contrib/Makefile.am.libidn silc-toolkit-1.1.7/lib/contrib/Makefile.am
+--- silc-toolkit-1.1.7/lib/contrib/Makefile.am.libidn	2008-03-20 02:43:31.000000000 -0400
++++ silc-toolkit-1.1.7/lib/contrib/Makefile.am	2008-06-04 14:14:04.000000000 -0400
 @@ -33,7 +33,11 @@ else
  REGEX = regexpr.c
  endif
@@ -32,9 +32,9 @@
  
  libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
  
-diff -up silc-toolkit-1.1.5/lib/Makefile.am.libidn silc-toolkit-1.1.5/lib/Makefile.am
---- silc-toolkit-1.1.5/lib/Makefile.am.libidn	2007-11-11 07:23:51.000000000 -0500
-+++ silc-toolkit-1.1.5/lib/Makefile.am	2008-01-08 09:05:38.000000000 -0500
+diff -up silc-toolkit-1.1.7/lib/Makefile.am.libidn silc-toolkit-1.1.7/lib/Makefile.am
+--- silc-toolkit-1.1.7/lib/Makefile.am.libidn	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
@@ -42,7 +42,7 @@
 -SILC_LINK_LIBS=
 -SILCCLIENT_LINK_LIBS=
 +SILC_LINK_LIBS=$(LIBIDN_LIBS) $(LIBS)
-+SILCCLIENT_LINK_LIBS=$(LIBS)
++SILCCLIENT_LINK_LIBS=$(top_builddir)/lib/libsilc.la
  SILCSERVER_LIBS=
  endif
  


--- libsilc-filter-provides.sh DELETED ---


