rpms/xmlsec1/devel separate_nspr.patch, NONE, 1.1 xmlsec1.spec, 1.13, 1.14
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Aug 8 09:55:57 UTC 2005
Author: veillard
Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19525
Modified Files:
xmlsec1.spec
Added Files:
separate_nspr.patch
Log Message:
nspr was separated as a separate package, needs a configure patch too, Daniel
separate_nspr.patch:
configure | 12 !!!!!!!!!!!!
configure.in | 2 !!
2 files changed, 14 modifications(!)
--- NEW FILE separate_nspr.patch ---
*** xmlsec1-1.2.8/configure.in.orig 2005-08-08 11:47:07.792057993 +0200
--- xmlsec1-1.2.8/configure.in 2005-08-08 11:47:36.736655823 +0200
***************
*** 507,513 ****
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,
[NSS_FOUND=yes],
[NSS_FOUND=no])
fi
--- 507,513 ----
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, nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
[NSS_FOUND=yes],
[NSS_FOUND=no])
fi
*** xmlsec1-1.2.8/configure.orig 2005-08-08 11:47:14.528033522 +0200
--- xmlsec1-1.2.8/configure 2005-08-08 11:47:36.013765767 +0200
***************
*** 25679,25701 ****
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
! if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_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"`
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"`
echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
echo "${ECHO_T}$NSS_LIBS" >&6
else
--- 25679,25701 ----
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 nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
! echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
! if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_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 "nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_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 "nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
echo "${ECHO_T}$NSS_LIBS" >&6
else
***************
*** 25703,25709 ****
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"`
fi
--- 25703,25709 ----
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 "nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
fi
Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xmlsec1.spec 8 Aug 2005 08:59:59 -0000 1.13
+++ xmlsec1.spec 8 Aug 2005 09:55:54 -0000 1.14
@@ -13,6 +13,7 @@
BuildRequires: libxslt-devel >= 1.1.0
Prefix: %{_prefix}
Docdir: %{_docdir}
+Patch0: separate_nspr.patch
%description
XML Security Library is a C library based on LibXML2 and OpenSSL.
@@ -111,7 +112,9 @@
Requires: libxml2 >= 2.4.24
Requires: libxslt >= 1.0.20
Requires: mozilla-nss >= 1.4
+Requires: nspr
BuildRequires: mozilla-nss-devel >= 1.4
+BuildRequires: nspr-devel
%description nss
NSS plugin for XML Security Library provides NSS based crypto services
@@ -126,6 +129,7 @@
Requires: libxml2-devel >= 2.4.24
Requires: libxslt-devel >= 1.0.20
Requires: mozilla-nss-devel >= 1.4
+Requires: nspr-devel
%description nss-devel
Libraries, includes, etc. for developing XML Security applications with NSS
@@ -133,6 +137,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure
@@ -227,8 +232,9 @@
%endif
%changelog
-* Mon Aug 8 2005 Tomas Mraz <tmraz at redhat.com> - 1.2.8-3
+* Mon Aug 8 2005 <veillard at redhat.com> 1.2.8-3
- rebuilt with new gnutls
+- nspr has been split to a separate package
* Fri Jul 8 2005 Daniel Veillard <veillard at redhat.com> 1.2.8-2
- Enabling the mozilla-nss crypto backend
* Fri Jul 8 2005 Daniel Veillard <veillard at redhat.com> 1.2.8-1
More information about the fedora-cvs-commits
mailing list