rpms/ggz-base-libs/devel ggz-base-libs-snapshot-0.99.5-tls_nss3.patch, NONE, 1.1 ggz-base-libs.spec, 1.6, 1.7

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/ggz-base-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6174

Modified Files:
	ggz-base-libs.spec 
Added Files:
	ggz-base-libs-snapshot-0.99.5-tls_nss3.patch 
Log Message:
* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-7
- --with-tls=NSS (#347021)
- %check: make check


ggz-base-libs-snapshot-0.99.5-tls_nss3.patch:
 configure                     |    4 ++--
 libggz/security/ggz_tls_nss.c |    4 ++--
 m4/tls.m4                     |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE ggz-base-libs-snapshot-0.99.5-tls_nss3.patch ---
diff -up ggz-base-libs-snapshot-0.99.5/configure.ac.nss3 ggz-base-libs-snapshot-0.99.5/configure.ac
diff -up ggz-base-libs-snapshot-0.99.5/configure.nss3 ggz-base-libs-snapshot-0.99.5/configure
--- ggz-base-libs-snapshot-0.99.5/configure.nss3	2009-01-02 13:48:05.000000000 -0600
+++ ggz-base-libs-snapshot-0.99.5/configure	2010-01-28 10:47:12.238459707 -0600
@@ -18004,8 +18004,8 @@ if test "$inc" != "" -a "$lib" != ""; th
 fi
 
   if test "$have_nss" = yes; then
-    GGZTLS_INCLUDES="-I $nss_includes"
-    GGZTLS_LDFLAGS="-L$nss_libraries"
+    GGZTLS_INCLUDES="$nss_includes"
+    GGZTLS_LDFLAGS="$nss_libraries"
     LIB_GGZTLS=$nss_lib
     { $as_echo "$as_me:$LINENO: result: using NSS" >&5
 $as_echo "using NSS" >&6; }
diff -up ggz-base-libs-snapshot-0.99.5/libggz/security/ggz_tls_nss.c.nss3 ggz-base-libs-snapshot-0.99.5/libggz/security/ggz_tls_nss.c
--- ggz-base-libs-snapshot-0.99.5/libggz/security/ggz_tls_nss.c.nss3	2009-01-02 13:32:34.000000000 -0600
+++ ggz-base-libs-snapshot-0.99.5/libggz/security/ggz_tls_nss.c	2010-01-28 10:41:01.384460653 -0600
@@ -26,8 +26,8 @@
 #include <unistd.h>
 
 #include <prinit.h>
-#include <nss/nss.h> // FIXME: evil path override!
-#include <nss/ssl.h>
+#include <nss.h> // FIXME: evil path override!
+#include <ssl.h>
 
 #include "ggz.h"
 
diff -up ggz-base-libs-snapshot-0.99.5/m4/tls.m4.nss3 ggz-base-libs-snapshot-0.99.5/m4/tls.m4
--- ggz-base-libs-snapshot-0.99.5/m4/tls.m4.nss3	2009-01-02 13:32:33.000000000 -0600
+++ ggz-base-libs-snapshot-0.99.5/m4/tls.m4	2010-01-28 10:46:40.208460985 -0600
@@ -345,8 +345,8 @@ then
   dnl NSS check
   AC_GGZ_NSS
   if test "$have_nss" = yes; then
-    GGZTLS_INCLUDES="-I $nss_includes"
-    GGZTLS_LDFLAGS="-L$nss_libraries"
+    GGZTLS_INCLUDES="$nss_includes"
+    GGZTLS_LDFLAGS="$nss_libraries"
     LIB_GGZTLS=$nss_lib
     AC_MSG_RESULT([using NSS])
     AC_DEFINE_UNQUOTED([GGZ_TLS_NSS], 1,


Index: ggz-base-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-base-libs/devel/ggz-base-libs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ggz-base-libs.spec	14 Dec 2009 17:03:24 -0000	1.6
+++ ggz-base-libs.spec	28 Jan 2010 16:53:03 -0000	1.7
@@ -1,10 +1,8 @@
 
-%define _with_gcrypt --with-gcrypt
-
 Summary: Base libraries for GGZ gaming zone
 Name:    ggz-base-libs
 Version: 0.99.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: LGPLv2+ and GPLv2+
 Group:   System Environment/Libraries
@@ -13,6 +11,9 @@ URL: http://www.ggzgamingzone.org/
 Source0: http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstreamable patches, fix --with-tls=NSS
+Patch50: ggz-base-libs-snapshot-0.99.5-tls_nss3.patch
+
 Obsoletes: libggz < 1:0.99.5
 Provides:  libggz = 1:%{version}-%{release}
 
@@ -24,10 +25,9 @@ Source1: ggz.modules
 Source2: macros.ggz
 
 BuildRequires: expat-devel
-%{?_with_gcrypt:BuildRequires: libgcrypt-devel >= 1.4}
 BuildRequires: gettext
-# --with-tls broken, FIXME
-#BuildRequires: gnutls-devel
+BuildRequires: libgcrypt-devel >= 1.4
+BuildRequires: nss-devel
 BuildRequires: pkgconfig
 
 
@@ -54,6 +54,8 @@ Requires: rpm
 %prep
 %setup -q -n %{name}-snapshot-%{version}
 
+%patch50 -p1 -b .tls_nss3
+
 %if 0 
 # some auto*/libtool love to quash rpaths
 rm -f m4/libtool.m4 m4/lt*
@@ -72,10 +74,8 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{
 %configure \
   --disable-debug \
   --disable-static \
-  %{?_with_gcrypt}
-
-## tls support disabled, for now, configure is broken wrt to these options
-#  --with-tls=GnuTLS 
+  --with-gcrypt \
+  --with-tls=NSS
 
 make %{?_smp_mflags}
 
@@ -103,6 +103,10 @@ cat ggz*.lang >> all.lang
 rm -f %{buildroot}%{_libdir}/lib*.la
 
 
+%check
+make check
+
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig 
@@ -153,6 +157,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-7
+- --with-tls=NSS (#347021)
+- %%check: make check
+
 * Sat Dec 12 2009 Rex Dieter <rdieter at fedoraproject.org> 0.99.5-6
 - Verify Check ( rpm -V ggz-client-libs ) (#487984)