--- a/ChangeLog Tue Jan 18 16:23:08 2005 -0500
+++ b/ChangeLog Tue Jan 18 19:58:51 2005 -0500
@@ -10,6 +10,8 @@
* More MSN bug fixes (Felipe Contreras)
* Fix queue messages to Docklet when not globally away (Robert McQueen)
+ * The Autopackage now builds both the mozilla-nss and the gnutls + ssl plugins, and requires at least one of those libraries. version 1.1.1 (12/28/2004):
* Allow SILC authentication via public key if your key is password
--- a/gaim.apspec.in Tue Jan 18 16:23:08 2005 -0500
+++ b/gaim.apspec.in Tue Jan 18 19:58:51 2005 -0500
@@ -26,7 +26,7 @@
Gaim is NOT affiliated with or endorsed by AOL.
-prepareBuild --disable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl
+prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl @@ -45,14 +45,8 @@
require @xiph.org/libao 2.0
require @gtkspell.sourceforge.net/gtkspell 0.0
-# ap alpha: while gnutls do not provide autopackages, we package this ourselves
-repo="http://autopackage.org/downloads/0.7"
-registerRepository @gnutls.org/gnutls $repo/gnutls.xml
-registerRepository @gnupg.org/libgcrypt $repo/libgcrypt.xml
-registerRepository @gnupg.org/libgpg-error $repo/libgpg-error.xml
+require @gnutls.org/gnutls 11.0 || { require @mozilla.org/nspr 4 && require @mozilla.org/nss 3; } -require @gnutls.org/gnutls 11.1
# Put your installation script here