rpms/dnssec-tools/devel libval-config, NONE, 1.1 dnssec-tools.spec, 1.6, 1.7

[Wes Hardaker (hardaker)]

Author: hardaker

Update of /cvs/extras/rpms/dnssec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25531

Modified Files:
	dnssec-tools.spec 
Added Files:
	libval-config 
Log Message:
added a libval-config wrapper


--- NEW FILE libval-config ---
#!/bin/sh
#
# libval-config
#
# this shell script is designed to merely dump the configuration
# information about how the libval package was compiled.  The
# information is particularily useful for applications that need to
# link against the libval libraries and hence must know about any
# other libraries that must be linked in as well.

# this particular shell script calls arch specific script to avoid
# multilib conflicts

# Supported arches ix86 ia64 ppc ppc64 s390 s390x x86_64 alpha

arch=`arch`
echo $arch | grep -q i.86
if [ $? -eq 0 ] ; then
    libval-config-i386 $*
    exit 0
fi
if [ "$arch" = "ia64" ] ; then
    libval-config-ia64 $*
    exit 0
fi
if [ "$arch" = "ppc" ] ; then
    libval-config-ppc $*
    exit 0
fi
if [ "$arch" = "ppc64" ] ; then
    libval-config-ppc64 $*
    exit 0
fi
if [ "$arch" = "s390" ] ; then
    libval-config-s390 $*
    exit 0
fi
if [ "$arch" = "s390x" ] ; then
    libval-config-s390x $*
    exit 0
fi
if [ "$arch" = "x86_64" ] ; then
    libval-config-x86_64 $*
    exit 0
fi
if [ "$arch" = "alpha" ] ; then
    libval-config-alpha $*
    exit 0
fi

echo "Cannot determine architecture"


Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dnssec-tools.spec	19 Nov 2007 22:36:56 -0000	1.6
+++ dnssec-tools.spec	27 Nov 2007 19:18:38 -0000	1.7
@@ -1,12 +1,13 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD-like
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
 Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Source1: dnssec-tools-dnsval.conf
+Source2: libval-config
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Require note: the auto-detection for perl-Net-DNS-SEC will not work since
 # the tools do run time tests for their existence.  But most of the tools
@@ -78,6 +79,13 @@
 chmod -R u+w %{buildroot}/*
 rm -f %{buildroot}%{_libdir}/*.la
 
+# Move the architecture dependent config file to its own place
+# (this allows multiple architecture rpms to be installed at the same time)
+mv ${RPM_BUILD_ROOT}/%{_bindir}/libval-config ${RPM_BUILD_ROOT}/%{_bindir}/libval-config-${basearch}
+# Add a new wrapper script that calls the right file at run time
+install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
+
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -218,7 +226,7 @@
 %{_libdir}/*.a
 %{_libdir}/*.so
 
-%{_bindir}/libval-config
+%{_bindir}/libval-config*
 
 %{_mandir}/man3/libval.3.gz
 %{_mandir}/man3/val_getaddrinfo.3.gz
@@ -254,6 +262,9 @@
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Tue Nov 27 2007 Wes Hardaker <wjhns174 at hardakers.net> - 1.3-5
+- Added a libval-config wrapper to get around a multi-arch issue
+
 * Mon Nov 19 2007 Wes Hardaker <wjhns174 at hardakers.net> - 1.3-4
 - Bogus release bump to fix fedora tag issue