rpms/xmlsec1
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Ugly patch and sed based changes to work around #192756 xmlsec1-config

Browse Source 
multilib problem, Daniel
This commit is contained in:
Daniel Veillard 2006-06-08 12:27:02 +00:00
parent f39c781973
commit a38c476cb0
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
multilib.patch Normal file
View File

@ -0,0 +1,34 @@
*** 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"

12
xmlsec1.spec
View File

@ -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 @@ 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.
@ -28,6 +29,7 @@ Requires: libxml2-devel >= 2.6.0
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 @@ Libraries, includes, etc. for developing XML Security applications with NSS
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure
@ -145,6 +148,9 @@ Libraries, includes, etc. for developing XML Security applications with NSS
#
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 @@ rm -fr %{buildroot}
%{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
%changelog
* Thu Jun 8 2006 Daniel Veillard <veillard@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@redhat.com> - 1.2.9-5
- move .so symlinks to -devel subpackage