From 30bb7f9ce7c3b749889c858c08c93c37aaaa3ea9 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Jul 11 2008 12:30:22 +0000 Subject: New upstream version 1.2.11 and rebuild for new gnutls, old patches are not needed, integrated upstream, Daniel --- diff --git a/.cvsignore b/.cvsignore index aebd688..b852888 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ xmlsec1-1.2.6.tar.gz xmlsec1-1.2.7.tar.gz xmlsec1-1.2.8.tar.gz xmlsec1-1.2.9.tar.gz +xmlsec1-1.2.11.tar.gz diff --git a/multilib.patch b/multilib.patch deleted file mode 100644 index 1bb7385..0000000 --- a/multilib.patch +++ /dev/null @@ -1,34 +0,0 @@ -*** xmlsec/xmlsec-config.in.orig 2006-06-08 13:56:20.000000000 +0200 ---- xmlsec/xmlsec-config.in 2006-06-08 14:01:10.000000000 +0200 -*************** -*** 4,9 **** ---- 4,15 ---- - package="@PACKAGE@" - exec_prefix="@exec_prefix@" - exec_prefix_set=no -+ if [ "`ldd /bin/sh | grep lib64`" = "" ] -+ then -+ archlib=lib -+ else -+ archlib=lib64 -+ fi - - usage() - { -*************** -*** 188,194 **** - # Assemble all the settings together - # - the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags" -! the_libs="$the_libs -L${exec_prefix}/lib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs" - - if $cflags; then - all_flags="$the_flags" ---- 194,200 ---- - # Assemble all the settings together - # - the_flags="$the_flags @XMLSEC_CORE_CFLAGS@ $the_xml_flags $the_xslt_flags $the_crypto_flags" -! the_libs="$the_libs -L${exec_prefix}/$archlib @XMLSEC_CORE_LIBS@ $the_xmlsec_crypto_lib -lxmlsec1 $the_xml_libs $the_xslt_libs $the_crypto_libs" - - if $cflags; then - all_flags="$the_flags" diff --git a/separate_nspr_nss.patch b/separate_nspr_nss.patch deleted file mode 100644 index 7f7b9f3..0000000 --- a/separate_nspr_nss.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- xmlsec1-1.2.9/xmlsec-nss.pc.in.old 2005-12-15 23:36:20.000000000 -0500 -+++ xmlsec1-1.2.9/xmlsec-nss.pc.in 2005-12-15 23:37:09.000000000 -0500 -@@ -6,6 +6,6 @@ - Name: xmlsec1-nss - Version: @VERSION@ - Description: XML Security Library implements XML Signature and XML Encryption standards --Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ mozilla-nss >= @MOZILLA_MIN_VERSION@ -+Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ nss >= @NSS_MIN_VERSION@ - Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@ - Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@ ---- xmlsec1-1.2.9/configure.old 2005-12-16 00:51:22.000000000 -0500 -+++ xmlsec1-1.2.9/configure 2005-12-16 00:52:02.000000000 -0500 -@@ -25929,23 +25929,23 @@ - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5 --echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" >&5 -+echo $ECHO_N "checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION... $ECHO_C" >&6 - -- if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; then -+ if $PKG_CONFIG --exists "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5 - echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6 -- NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"` -+ NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"` - echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5 - echo "${ECHO_T}$NSS_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking NSS_LIBS" >&5 - echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6 -- NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"` -+ NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"` - echo "$as_me:$LINENO: result: $NSS_LIBS" >&5 - echo "${ECHO_T}$NSS_LIBS" >&6 - else -@@ -25953,7 +25953,7 @@ - NSS_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. -- NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"` -+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"` - - fi - ---- xmlsec1-1.2.9/configure.in.old 2005-12-15 23:35:35.000000000 -0500 -+++ xmlsec1-1.2.9/configure.in 2005-12-15 23:56:06.000000000 -0500 -@@ -540,7 +540,7 @@ - AC_MSG_RESULT(no) - NSS_FOUND="without" - elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then -- PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION, -+ PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION, - [NSS_FOUND=yes], - [NSS_FOUND=no]) - fi diff --git a/sources b/sources index 2ae5403..12f9105 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b378a076708766966724aaeba09e4607 xmlsec1-1.2.9.tar.gz +5652d44eec1375a399a6c61f5f6091f1 xmlsec1-1.2.11.tar.gz diff --git a/xmlsec1.spec b/xmlsec1.spec index 41e395c..e5af201 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,11 +1,11 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.9 -Release: 10.1 +Version: 1.2.11 +Release: 1 License: MIT Group: Development/Libraries Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.aleksey.com/xmlsec/ Requires: libxml2 >= 2.6.0 Requires: libxslt >= 1.1.0 @@ -13,31 +13,29 @@ BuildRequires: libxml2-devel >= 2.6.0 BuildRequires: libxslt-devel >= 1.1.0 Prefix: %{_prefix} Docdir: %{_docdir} -Patch0: separate_nspr_nss.patch -Patch1: multilib.patch %description -XML Security Library is a C library based on LibXML2 and OpenSSL. -The library was created with a goal to support major XML security -standards "XML Digital Signature" and "XML Encryption". +XML Security Library is a C library based on LibXML2 and OpenSSL. +The library was created with a goal to support major XML security +standards "XML Digital Signature" and "XML Encryption". -%package devel +%package devel Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support. -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2-devel >= 2.6.0 Requires: libxslt-devel >= 1.1.0 Requires: openssl-devel >= 0.9.6 -Requires: zlib-devel +Requires: zlib-devel Requires: pkgconfig %description devel -Libraries, includes, etc. you can use to develop applications with XML Digital +Libraries, includes, etc. you can use to develop applications with XML Digital Signatures and XML Encryption support. %package openssl Summary: OpenSSL crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2 >= 2.6.0 Requires: libxslt >= 1.1.0 @@ -56,7 +54,7 @@ for the xmlsec library %package openssl-devel Summary: OpenSSL crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: xmlsec1-devel = %{version} Requires: xmlsec1-openssl = %{version} @@ -70,7 +68,7 @@ Libraries, includes, etc. for developing XML Security applications with OpenSSL %package gnutls Summary: GNUTls crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2 >= 2.6.0 Requires: libxslt >= 1.1.0 @@ -91,7 +89,7 @@ for the xmlsec library %package gnutls-devel Summary: GNUTls crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: xmlsec1-devel = %{version} Requires: xmlsec1-openssl = %{version} @@ -107,7 +105,7 @@ Libraries, includes, etc. for developing XML Security applications with GNUTls %package nss Summary: NSS crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: libxml2 >= 2.4.24 Requires: libxslt >= 1.0.20 @@ -122,7 +120,7 @@ for the xmlsec library %package nss-devel Summary: NSS crypto plugin for XML Security Library -Group: Development/Libraries +Group: Development/Libraries Requires: xmlsec1 = %{version} Requires: xmlsec1-devel = %{version} Requires: xmlsec1-nss = %{version} @@ -136,8 +134,6 @@ Libraries, includes, etc. for developing XML Security applications with NSS %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure @@ -171,7 +167,7 @@ rm -fr %{buildroot} %postun /sbin/ldconfig -%files +%files %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README Copyright @@ -181,7 +177,7 @@ rm -fr %{buildroot} %{prefix}/bin/xmlsec1 %files devel -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/bin/xmlsec1-config %dir %{prefix}/include/xmlsec1 @@ -194,17 +190,18 @@ rm -fr %{buildroot} %{prefix}/lib*/pkgconfig/xmlsec1.pc %{prefix}/lib*/xmlsec1Conf.sh %dir %{prefix}/share/doc/xmlsec1 -%{prefix}/share/doc/xmlsec1/* +%{prefix}/share/doc/xmlsec1/* %doc AUTHORS HACKING ChangeLog NEWS README Copyright %doc %{_mandir}/man1/xmlsec1-config.1* +%{_datadir}/aclocal/xmlsec1.m4 %files openssl -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/lib*/libxmlsec1-openssl.so.* %files openssl-devel -%defattr(-, root, root) +%defattr(-, root, root) %dir %{prefix}/include/xmlsec1/xmlsec/openssl %{prefix}/include/xmlsec1/xmlsec/openssl/*.h @@ -213,12 +210,12 @@ rm -fr %{buildroot} %{prefix}/lib*/pkgconfig/xmlsec1-openssl.pc %files gnutls -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/lib*/libxmlsec1-gnutls.so.* %files gnutls-devel -%defattr(-, root, root) +%defattr(-, root, root) %dir %{prefix}/include/xmlsec1/xmlsec/gnutls %{prefix}/include/xmlsec1/xmlsec/gnutls/*.h @@ -227,12 +224,12 @@ rm -fr %{buildroot} %{prefix}/lib*/pkgconfig/xmlsec1-gnutls.pc %files nss -%defattr(-, root, root) +%defattr(-, root, root) %{prefix}/lib*/libxmlsec1-nss.so.* %files nss-devel -%defattr(-, root, root) +%defattr(-, root, root) %dir %{prefix}/include/xmlsec1/xmlsec/nss %{prefix}/include/xmlsec1/xmlsec/nss/*.h