From 936ffd0783a231cf6ae5013d81688791e7de26f5 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 16 May 2016 20:04:00 +0200
Subject: [PATCH] - updated to 1.2.22 - updated nss patch

---
 xmlsec1-nss.patch | 28 +++++++++++++---------------
 xmlsec1.spec      | 11 ++++++-----
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/xmlsec1-nss.patch b/xmlsec1-nss.patch
index 7bc7c49..39ed305 100644
--- a/xmlsec1-nss.patch
+++ b/xmlsec1-nss.patch
@@ -1,6 +1,6 @@
---- xmlsec1-1.2.6/configure.in.orig	2004-08-26 04:49:24.000000000 +0200
-+++ xmlsec1-1.2.6/configure.in	2004-10-31 00:56:57.447586088 +0200
-@@ -553,16 +553,11 @@
+--- xmlsec1-1.2.22/configure.ac.orig	2016-04-20 18:26:22.000000000 +0200
++++ xmlsec1-1.2.22/configure.ac	2016-05-16 19:03:57.729094153 +0200
+@@ -683,16 +683,11 @@
  	fi
  	NSPR_INCLUDES_FOUND="yes"
  	NSPR_LIBS_FOUND="yes"
@@ -19,7 +19,16 @@
  		NSPR_INCLUDES_FOUND="yes"
  		NSPR_PRINIT_H="$dir/nspr/prinit.h"
      		break
-@@ -624,16 +619,11 @@
+@@ -746,7 +741,7 @@
+     NSS_NSS_H=""
+ 
+     if test "z$with_nss" != "z" ; then
+-	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
++	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr"
+ 	if test "z$with_gnu_ld" = "zyes" ; then
+ 	    NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
+         else
+@@ -754,16 +749,11 @@
          fi
  	NSS_INCLUDES_FOUND="yes"
  	NSS_LIBS_FOUND="yes"
@@ -38,14 +47,3 @@
      		NSS_INCLUDES_FOUND="yes"
      		NSS_NSS_H="$dir/nss/nss.h"
      		break
---- xmlsec1-1.2.14/configure.in~	2010-04-26 09:58:24.901946082 +0200
-+++ xmlsec1-1.2.14/configure.in	2010-04-26 10:01:17.278214712 +0200
-@@ -689,7 +689,7 @@
-     NSS_NSS_H=""
- 
-     if test "z$with_nss" != "z" ; then
--	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
-+	NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr"
- 	if test "z$with_gnu_ld" = "zyes" ; then
- 	    NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
-         else
diff --git a/xmlsec1.spec b/xmlsec1.spec
index dca20cb..4dc51df 100644
--- a/xmlsec1.spec
+++ b/xmlsec1.spec
@@ -1,17 +1,18 @@
 Summary:	XML Security Library
 Summary(pl.UTF-8):	Biblioteka bezpieczeństwa XML
 Name:		xmlsec1
-Version:	1.2.20
-Release:	3
+Version:	1.2.22
+Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	http://www.aleksey.com/xmlsec/download/%{name}-%{version}.tar.gz
-# Source0-md5:	ce12af00283eb90d9281956524250d6e
+Source0:	https://www.aleksey.com/xmlsec/download/%{name}-%{version}.tar.gz
+# Source0-md5:	0fb1bb06d60d7708abc4797008209bcc
 Patch0:		%{name}-nss.patch
-URL:		http://www.aleksey.com/xmlsec/
+URL:		https://www.aleksey.com/xmlsec/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	gnutls-devel >= 2.8.0
+BuildRequires:	help2man
 BuildRequires:	libgcrypt-devel >= 1.4.0
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 2:2.0
-- 
2.43.0