rpms/libtasn1/devel libtasn1-2.4-rpath.patch, NONE, 1.1 libtasn1.spec, 1.36, 1.37
Tomáš Mráz
tmraz at fedoraproject.org
Thu Jan 28 12:58:41 UTC 2010
Author: tmraz
Update of /cvs/pkgs/rpms/libtasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15732
Modified Files:
libtasn1.spec
Added Files:
libtasn1-2.4-rpath.patch
Log Message:
* Thu Jan 28 2010 Tomas Mraz <tmraz at redhat.com> - 2.4-2
- drop superfluous rpath
libtasn1-2.4-rpath.patch:
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE libtasn1-2.4-rpath.patch ---
diff -up libtasn1-2.4/configure.rpath libtasn1-2.4/configure
--- libtasn1-2.4/configure.rpath 2010-01-18 08:58:04.000000000 +0100
+++ libtasn1-2.4/configure 2010-01-28 13:54:09.000000000 +0100
@@ -10509,7 +10509,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -10894,7 +10894,7 @@ rm -f core conftest.err conftest.$ac_obj
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
Index: libtasn1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- libtasn1.spec 18 Jan 2010 09:50:45 -0000 1.36
+++ libtasn1.spec 28 Jan 2010 12:58:40 -0000 1.37
@@ -3,7 +3,7 @@
Summary: The ASN.1 library used in GNUTLS
Name: libtasn1
Version: 2.4
-Release: %release_func 1
+Release: %release_func 2
# The libtasn1 library is LGPLv2+, utilities are GPLv3+
License: GPLv3+ and LGPLv2+
@@ -11,6 +11,7 @@ Group: System Environment/Libraries
URL: http://www.gnu.org/software/libtasn1/
Source0: http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz
Source1: http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz.sig
+Patch1: libtasn1-2.4-rpath.patch
BuildRoot: %_tmppath/%name-%version-%release-buildroot
BuildRequires: bison, pkgconfig
%ifarch %ix86 x86_64 ppc ppc64
@@ -56,6 +57,8 @@ This package contains tools using the li
%prep
%setup -q
+%patch1 -p1 -b .rpath
+
%build
%configure --disable-static
@@ -111,6 +114,9 @@ test "$1" = 0 -a -f %_infodir/%name.info
%changelog
+* Thu Jan 28 2010 Tomas Mraz <tmraz at redhat.com> - 2.4-2
+- drop superfluous rpath
+
* Mon Jan 18 2010 Tomas Mraz <tmraz at redhat.com> - 2.4-1
- new upstream release
More information about the scm-commits
mailing list