rpms/xmlsec1/devel multilib.patch,NONE,1.1 xmlsec1.spec,1.23,1.24

[fedora-cvs-commits at redhat.com]

Author: veillard

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24720

Modified Files:
	xmlsec1.spec 
Added Files:
	multilib.patch 
Log Message:
Ugly patch and sed based changes to work around #192756 xmlsec1-config
multilib problem, Daniel


multilib.patch:
 xmlsec-config.in |    8 ++++++!!
 1 files changed, 6 insertions(+), 2 modifications(!)

--- NEW FILE multilib.patch ---
*** 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"


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xmlsec1.spec	7 Jun 2006 22:13:24 -0000	1.23
+++ xmlsec1.spec	8 Jun 2006 12:27:02 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.9
-Release: 5
+Release: 6
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -14,6 +14,7 @@
 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. 
@@ -28,6 +29,7 @@
 Requires: libxslt-devel >= 1.1.0
 Requires: openssl-devel >= 0.9.6
 Requires: zlib-devel 
+Requires: pkgconfig
 
 %description devel
 Libraries, includes, etc. you can use to develop applications with XML Digital 
@@ -135,6 +137,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -145,6 +148,9 @@
 #
 make
 
+# positively ugly but only sane way to get around #192756
+sed 's+/lib64+/$archlib+g' < xmlsec1-config | sed 's+/lib+/$archlib+g' | sed 's+ -DXMLSEC_NO_SIZE_T++' > xmlsec1-config.$$ && mv xmlsec1-config.$$ xmlsec1-config
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -227,6 +233,10 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Thu Jun  8 2006 Daniel Veillard <veillard at redhat.com> - 1.2.9-6
+- Ugly patch and sed based changes to work around #192756 xmlsec1-config
+  multilib problem
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.2.9-5
 - move .so symlinks to -devel subpackage