From bbef72d6c078d509f2e272b9b7ac5b4c4a0e9865 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Sep 07 2009 10:39:10 +0000
Subject: - New upstream release

- Our NSS patch integrated

---

diff --git a/centerim-4.22.7-nss.patch b/centerim-4.22.7-nss.patch
deleted file mode 100644
index 33cbcb8..0000000
--- a/centerim-4.22.7-nss.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From cf415ea0a45fc77153dd1969d486aa9a1bf95e6f Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Wed, 29 Apr 2009 19:10:59 +0200
-Subject: [PATCH] Fix libgadu and libicq NSS cryptography support
-
-Fixes needed to get it compile with Fedora's nss_ossl_compat
-library.
----
- configure.ac      |    2 ++
- libgadu/events.c  |    4 +++-
- libgadu/libgadu.c |    4 +++-
- libgadu/libgadu.h |    6 +++++-
- 4 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a5f3fa0..6ddaa32 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -213,6 +213,7 @@ if test "x$with_ssl" != "xno"; then
- 		# drags in NSPR as well
-                 PKG_CHECK_MODULES(NSS, nss >= 3)
- 		CFLAGS="$CFLAGS $NSS_CFLAGS"
-+		CXXFLAGS="$CXXFLAGS $NSS_CFLAGS"
- 		LIBS="$LIBS $NSS_LIBS"
- 
- 		# The compatibility layer
-@@ -220,6 +221,7 @@ if test "x$with_ssl" != "xno"; then
-                 if test -n "$with_nss_compat" -a "x$with_nss_compat" != "xno"; then
-                         if test -f "${with_nss_compat}"; then
-                                 CFLAGS="$CFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
-+                                CXXFLAGS="$CXXFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
-                         fi
-                         AC_CHECK_LIB(nss_compat_ossl, SSL_CTX_new, [
-                                 AC_DEFINE(HAVE_NSS_COMPAT, 1, [use nss_compat])
-diff --git a/libgadu/events.c b/libgadu/events.c
-index 3242d16..6ebc261 100644
---- a/libgadu/events.c
-+++ b/libgadu/events.c
-@@ -38,9 +38,11 @@
- #include <stdlib.h>
- #include <time.h>
- #include <unistd.h>
--#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
-+#if defined(HAVE_OPENSSL)
- #  include <openssl/err.h>
- #  include <openssl/x509.h>
-+#elif defined(HAVE_NSS_COMPAT)
-+#  include <nss_compat_ossl/nss_compat_ossl.h>
- #elif HAVE_GNUTLS
- #  include <gnutls/gnutls.h>
- #endif
-diff --git a/libgadu/libgadu.c b/libgadu/libgadu.c
-index 58c2df5..b3f5585 100644
---- a/libgadu/libgadu.c
-+++ b/libgadu/libgadu.c
-@@ -41,10 +41,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
--#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
-+#if defined(HAVE_OPENSSL)
- #define OPENSSL_NO_KRB5 1
- #  include <openssl/err.h>
- #  include <openssl/rand.h>
-+#elif defined(HAVE_NSS_COMPAT)
-+#  include <nss_compat_ossl/nss_compat_ossl.h>
- #elif HAVE_GNUTLS
- #include <gnutls/gnutls.h>
- #endif
-diff --git a/libgadu/libgadu.h b/libgadu/libgadu.h
-index 5bd96e7..abb36e1 100644
---- a/libgadu/libgadu.h
-+++ b/libgadu/libgadu.h
-@@ -37,7 +37,7 @@ extern "C" {
- #include <stdio.h>
- #include <stdarg.h>
- 
--#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
-+#if defined(HAVE_OPENSSL)
- 
- #ifndef OPENSSL_NO_KRB5
- #define OPENSSL_NO_KRB5 1
-@@ -45,6 +45,10 @@ extern "C" {
- 
- #include <openssl/ssl.h>
- 
-+#elif defined(HAVE_NSS_COMPAT)
-+
-+#include <nss_compat_ossl/nss_compat_ossl.h>
-+
- #elif HAVE_GNUTLS
- #include <gnutls/openssl.h>
- #endif
--- 
-1.6.2.2
-
diff --git a/centerim.spec b/centerim.spec
index cbec383..950386c 100644
--- a/centerim.spec
+++ b/centerim.spec
@@ -1,6 +1,6 @@
 Name:           centerim
-Version:        4.22.7
-Release:        3%{?dist}
+Version:        4.22.8
+Release:        1%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -8,12 +8,11 @@ Summary:        Text mode menu- and window-driven IM
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.centerim.org/
-Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.bz2
+Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
 Source1:        http://www.centerim.org/images/b/b5/Centerim_b.svg
 Source2:        centerim.desktop
 
 Patch0:         centerim-4.22.6-url-escape-fedora.patch
-Patch1:         centerim-4.22.7-nss.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,7 +45,6 @@ Internal RSS reader and a client for LiveJournal are provided.
 %prep
 %setup -q
 %patch0 -p1 -b .url-escape-fedora
-%patch1 -p1 -b .nss
 
 iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
 touch -r ChangeLog ChangeLog.utf8
@@ -100,8 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1:4.22.7-3
-- rebuilt with new openssl
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak@v3.sk> - 1:4.22.8-1
+- New upstream release
+- Our NSS patch integrated
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.22.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild