packages: xml-security-c/xml-security-c.spec - xml-security-c-1.5.1-xalan-c...

[glen]

Author: glen                         Date: Mon Jan  3 20:35:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- xml-security-c-1.5.1-xalan-c-1.11-compat.patch from opensuse (security:eID)

---- Files affected:
packages/xml-security-c:
   xml-security-c.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/xml-security-c/xml-security-c.spec
diff -u packages/xml-security-c/xml-security-c.spec:1.1 packages/xml-security-c/xml-security-c.spec:1.2
--- packages/xml-security-c/xml-security-c.spec:1.1	Mon Jan  3 21:27:26 2011
+++ packages/xml-security-c/xml-security-c.spec	Mon Jan  3 21:35:19 2011
@@ -3,7 +3,7 @@
 # Conditional build:
 %bcond_without	tests		# build without tests
 %bcond_without	static_libs	# don't build static libraries
-%bcond_without	xalan_c		# build without xalan-c (XPath and XSLT transformations cannot be performed)
+%bcond_without	xalan		# build without xalan-c (XPath and XSLT transformations cannot be performed)
 
 Summary:	C++ Implementation of W3C security standards for XML
 Name:		xml-security-c
@@ -14,10 +14,11 @@
 URL:		http://santuario.apache.org/c/
 Source0:	http://santuario.apache.org/dist/c-library/%{name}-%{version}.tar.gz
 # Source0-md5:	2c47c4ec12e8d6abe967aa5e5e99000c
+Patch0:		%{name}-1.5.1-xalan-c-1.11-compat.patch
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
-%{?with_xalan_c:BuildRequires:	xalan-c-devel}
+%{?with_xalan:BuildRequires:	xalan-c-devel}
 BuildRequires:	xerces-c-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,7 +35,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	openssl-devel
-%{?with_xalan_c:Requires:	xalan-c-devel}
+%{?with_xalan:Requires:	xalan-c-devel}
 Requires:	xerces-c-devel
 
 %description devel
@@ -52,8 +53,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
+
 # Remove bogus "-O2" from CXXFLAGS to avoid overriding RPM_OPT_FLAGS.
-sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
+%{__sed} -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
 
 %build
 %configure \
@@ -107,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/01/03 20:35:19  glen
+- xml-security-c-1.5.1-xalan-c-1.11-compat.patch from opensuse (security:eID)
+
 Revision 1.1  2011/01/03 20:27:26  glen
 - new, based on spec from fc repo
   build with xalan_c needs c++ fix
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xml-security-c/xml-security-c.spec?r1=1.1&r2=1.2&f=u