X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxmlsec1.git;a=blobdiff_plain;f=xmlsec1.spec;h=50a5cdb96c239a4e5ff49080bb5efcc160f8c65c;hp=cd1646d2ae48a220f1cff4336f82262ddc70fff8;hb=8d7d8af;hpb=e192fa5ecb6921e0fcf78cf47b5a2d963547e2d6

diff --git a/xmlsec1.spec b/xmlsec1.spec
index cd1646d..50a5cdb 100644
--- a/xmlsec1.spec
+++ b/xmlsec1.spec
@@ -1,27 +1,28 @@
 Summary:	XML Security Library
 Summary(pl.UTF-8):	Biblioteka bezpieczeństwa XML
 Name:		xmlsec1
-Version:	1.2.20
+Version:	1.2.31
 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:	182f5cbdfb8ddbac535c04470c170dc3
 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
-BuildRequires:	libxml2-devel >= 1:2.7.4
+BuildRequires:	libxml2-devel >= 1:2.8.0
 BuildRequires:	libxslt-devel >= 1.0.20
 BuildRequires:	nspr-devel >= 4.4.1
-BuildRequires:	nss-devel >= 3.9
+BuildRequires:	nss-devel >= 3.11.1
 BuildRequires:	openssl-devel >= 1.0.0
 BuildRequires:	pkgconfig >= 1:0.9
-Requires:	libxml2 >= 1:2.7.4
+Requires:	libxml2 >= 1:2.8.0
 Requires:	libxslt >= 1.0.20
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,7 +69,7 @@ Summary:	Header files for XMLSec library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki XMLSec
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libxml2-devel >= 1:2.7.4
+Requires:	libxml2-devel >= 1:2.8.0
 Requires:	libxslt-devel >= 1.0.20
 
 %description devel
@@ -94,6 +95,9 @@ Summary:	XMLSec library API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki XMLSec
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 XMLSec library API documentation.
@@ -147,7 +151,7 @@ Statyczna biblioteka kryptograficzna GCrypt dla biblioteki XMLSec.
 Summary:	GnuTLS Crypto library for XML Security Library
 Summary(pl.UTF-8):	Biblioteka kryptograficzna GnuTLS dla biblioteki XMLSec
 Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-gcrypt = %{version}-%{release}
 Requires:	gnutls >= 2.8.0
 
 %description gnutls
@@ -162,7 +166,7 @@ usługi kryptograficzne oparte na bibliotece GnuTLS.
 Summary:	Header files for XMLSec GnuTLS API
 Summary(pl.UTF-8):	Pliki nagłówkowe API GnuTLS XMLSec
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-gcrypt-devel = %{version}-%{release}
 Requires:	%{name}-gnutls = %{version}-%{release}
 Requires:	gnutls-devel >= 2.8.0
 
@@ -191,7 +195,7 @@ Summary(pl.UTF-8):	Biblioteka kryptograficzna NSS dla biblioteki XMLSec
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	nspr >= 4.4.1
-Requires:	nss >= 3.9
+Requires:	nss >= 3.11.1
 
 %description nss
 NSS Crypto library for XML Security Library provides NSS based crypto
@@ -208,7 +212,7 @@ Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-nss = %{version}-%{release}
 Requires:	nspr-devel >= 4.4.1
-Requires:	nss-devel >= 3.9
+Requires:	nss-devel >= 3.11.1
 
 %description nss-devel
 Header files for developing XML Security applications with NSS.
@@ -275,6 +279,8 @@ Statyczna biblioteka kryptograficzna OpenSSL dla biblioteki XMLSec.
 %setup -q
 %patch0 -p1
 
+%{__sed} -i -e '/\/lib\/[^ ]*_MARKER/ s,/lib/,/%{_lib}/,' configure.ac
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -328,7 +334,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/xmlsec1
 %dir %{_includedir}/xmlsec1/xmlsec
 %{_includedir}/xmlsec1/xmlsec/*.h
-%{_includedir}/xmlsec1/xmlsec/private
 %{_pkgconfigdir}/xmlsec1.pc
 %{_aclocaldir}/xmlsec1.m4
 %{_mandir}/man1/xmlsec1-config.1*