updates.

diff --git a/CHANGES b/CHANGES
index fb5fd2e9c352a4ca68140d5c09e36803bbd69783..d77cdd85683ea0cf811279f9fc7e48ffd9aa320b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+Sat Jun  2 21:04:32 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
+
+       * SIM modules are not delivered to SILC CLient distribution
+         anymore.
+
+       * Removed --with-etcdir and --with-docdir.  The etcdir is now
+         the system's default.  The Docdir is system's default.
+
 Sat Jun  2 00:51:57 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * If public key/private key loading fails set the return

diff --git a/configure.ad b/configure.ad
index db578704296152999bb384c880b5c4b82f09f4b5..3a855ec38f860e65c7a8d2388b6cb5f6a31cddb6 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -497,54 +497,20 @@ AC_SUBST(FIX_SHA1)
 
 # Default installation destination
 #
-#ifdef SILC_DIST_AUTODIST
 AC_PREFIX_DEFAULT(/usr/local)
-#else !SILC_DIST_AUTODIST
-AC_PREFIX_DEFAULT(/usr/local/silc)
-#endif SILC_DIST_AUTODIST
 if test "x$prefix" != xNONE; then
   silc_prefix="$prefix"
 else
   silc_prefix="$ac_default_prefix"
+  prefix="$silc_prefix"
 fi
 
 #ifndef SILC_DIST_AUTODIST
-# etc directory
-#
-if test "x$sysconfdir" != 'x${prefix}/etc'; then
-  ETCDIR="$sysconfdir"
-else
-  ETCDIR="$silc_prefix/etc"
-fi
-
-AC_ARG_WITH(etcdir,
-  [[  --with-etcdir=DIR       directory for system files [/etc/silc]]],
-  [
-    case "$withval" in
-      no|yes)
-        ;;
-      *)
-        ETCDIR="$withval"
-        ;;
-    esac
-  ])
+ETCDIR=`eval echo $sysconfdir`;ETCDIR=`eval echo $ETCDIR`
 AC_SUBST(ETCDIR)
 AC_DEFINE_UNQUOTED([SILC_ETCDIR], "$ETCDIR", [SILC_ETCDIR])
 
-# doc directory
-#
-DOCDIR="$silc_prefix/doc"
-AC_ARG_WITH(docdir,
-  [[  --with-docdir=DIR       directory for SILC documentation [PREFIX/doc]]],
-  [
-    case "$withval" in
-      no|yes)
-        ;;
-      *)
-        DOCDIR="$withval"
-        ;;
-    esac
-  ])
+DOCDIR=`eval echo $docdir`;DOCDIR=`eval echo $DOCDIR`
 AC_SUBST(DOCDIR)
 AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOCDIR])
 #endif SILC_DIST_AUTODIST

diff --git a/distdir/client b/distdir/client
index c84d1d64a283d91818fb3eb1d634633175b4df9e..4ad2f057443444116a1cb44cb3e2ad6ccfd9af7f 100644 (file)
--- a/distdir/client
+++ b/distdir/client
@@ -1,6 +1,7 @@
 name Client
 package silc-client
 bug-report silc-devel@lists.silcnet.org
+prereq 1.3.2
 
 inherit common
 define SILC_DIST_CLIENT

diff --git a/distdir/pre-dist-client b/distdir/pre-dist-client
index 0e9619dcae785cb7050d6d0e8ccef7ec348905c7..bf3ffb3d2c494d68577fdf4f01207a8606d4c126 100644 (file)
--- a/distdir/pre-dist-client
+++ b/distdir/pre-dist-client
@@ -4,6 +4,14 @@ distribution=$1
 dist_version=$2
 package=$3
 distdir=$4
+release=$5
+
+if test -z $release; then
+  release="0.fc7"
+fi
+
+sed -e "s/SILC_VERSION/$dist_version/" -e "s/SILC_RELEASE/$release/" \
+  apps/irssi/silc-client.spec.in > apps/irssi/silc-client.spec
 
 cd doc
 make dist-hook

diff --git a/lib/doc/notifyargs.html b/lib/doc/notifyargs.html
index d7e8209435f269df6e95035f207174a7024aef9c..c9c904d5aafee1d04012a9420b29979c9f1cd282 100644 (file)
--- a/lib/doc/notifyargs.html
+++ b/lib/doc/notifyargs.html
@@ -85,7 +85,7 @@ The 'message' argument may be NULL.
 Sent to the client if the user is invited on a channel. The 'channel
 argument may be NULL but the `channel_name' is always provided.
 </td>
-<td width="50%"><small>SilcClientChannel channel, char *channel_name,
+<td width="50%"><small>SilcChannelEntry channel, char *channel_name,
 SilcClientEntry inviter
 </td>
 </tr>
@@ -116,7 +116,7 @@ Sent when someone signoff the SILC network.  The 'signoff_message' may be
 NULL.  The `signoff_client' is the client signing off.  The `channel' is
 the channel where the client was joined.  The `channel' may be NULL.
 </td>
-<td width="50%"><small>SilcClientEntry signoff_client, char 
+<td width="50%"><small>SilcClientEntry signoff_client, char
 *signoff_message, SilcChannelEntry channel
 </td>
 </tr>

diff --git a/silc-toolkit.spec.in b/silc-toolkit.spec.in
index a59ee1c63c013a46e1db1851aa85cb8d3b1a83ed..3ddb819f83f9c47d2135c0f3f6d4612b93a118f4 100644 (file)
--- a/silc-toolkit.spec.in
+++ b/silc-toolkit.spec.in
@@ -19,7 +19,8 @@ Epoch: 0
 %description
 SILC Toolkit providing SILC Protocol Core Library, SILC Client Library,
 runtime library and many other libraries.  SILC Toolkit enables SILC
-application development.
+application development.  SILC (Secure Internet Live Conferencing) is a
+secure conferencing protocol.
 
 %package devel
 Group: Development/Libraries