From dcf6be7f5275e24011bcf622a8ede28223999cb4 Mon Sep 17 00:00:00 2001 From: Tomáš Mráz Date: Jan 28 2010 21:22:45 +0000 Subject: - drop superfluous rpath from binaries - do not call autoreconf during build - specify the license on utils subpackage --- diff --git a/gnutls-2.8.5-rpath.patch b/gnutls-2.8.5-rpath.patch new file mode 100644 index 0000000..9377722 --- /dev/null +++ b/gnutls-2.8.5-rpath.patch @@ -0,0 +1,112 @@ +diff -up gnutls-2.8.5/build-aux/config.rpath gnutls-2.8.5/build-aux/config +diff -up gnutls-2.8.5/configure.rpath gnutls-2.8.5/configure +--- gnutls-2.8.5/configure.rpath 2009-11-02 11:35:57.000000000 +0100 ++++ gnutls-2.8.5/configure 2010-01-28 22:12:20.000000000 +0100 +@@ -15141,7 +15141,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 + +@@ -15526,7 +15526,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 +@@ -18610,7 +18610,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 + +@@ -18994,7 +18994,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 +@@ -29278,6 +29278,7 @@ finish_cmds='`$ECHO "X$finish_cmds" | $X + finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' + sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++ + sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' + hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' + enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +diff -up gnutls-2.8.5/lib/build-aux/config.rpath gnutls-2.8.5/lib/build-aux/config +diff -up gnutls-2.8.5/lib/configure.rpath gnutls-2.8.5/lib/configure +--- gnutls-2.8.5/lib/configure.rpath 2009-11-02 11:35:18.000000000 +0100 ++++ gnutls-2.8.5/lib/configure 2010-01-28 22:14:03.000000000 +0100 +@@ -10465,7 +10465,8 @@ 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 + +@@ -10850,7 +10851,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 +@@ -24444,7 +24445,8 @@ 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 + +@@ -24828,7 +24830,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 +diff -up gnutls-2.8.5/libextra/build-aux/config.rpath gnutls-2.8.5/libextra/build-aux/config +diff -up gnutls-2.8.5/libextra/configure.rpath gnutls-2.8.5/libextra/configure +--- gnutls-2.8.5/libextra/configure.rpath 2009-11-02 11:35:38.000000000 +0100 ++++ gnutls-2.8.5/libextra/configure 2010-01-28 21:45:25.000000000 +0100 +@@ -9821,7 +9821,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 + +@@ -10206,7 +10206,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 diff --git a/gnutls.spec b/gnutls.spec index e55c23d..81d91b8 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -1,7 +1,7 @@ Summary: A TLS protocol implementation Name: gnutls Version: 2.8.5 -Release: 2%{?dist} +Release: 3%{?dist} # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ License: GPLv3+ and LGPLv2+ Group: System Environment/Libraries @@ -15,6 +15,7 @@ URL: http://www.gnutls.org/ # XXX patent tainted SRP code removed. Source0: %{name}-%{version}-nosrp.tar.bz2 Source1: libgnutls-config +Patch1: gnutls-2.8.5-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libgcrypt >= 1.2.2 @@ -29,6 +30,7 @@ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %package utils +License: GPLv3+ Summary: Command line tools for TLS protocol Group: Applications/System Requires: %{name} = %{version}-%{release} @@ -66,13 +68,13 @@ This package contains Guile bindings for the library. %prep %setup -q +%patch1 -p1 -b .rpath for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do touch lib/$i done %build -autoreconf %configure --with-libtasn1-prefix=%{_prefix} \ --with-included-libcfg \ --disable-static \ @@ -147,6 +149,11 @@ fi %{_datadir}/guile/site/gnutls.scm %changelog +* Thu Jan 28 2010 Tomas Mraz 2.8.5-3 +- drop superfluous rpath from binaries +- do not call autoreconf during build +- specify the license on utils subpackage + * Mon Jan 18 2010 Tomas Mraz 2.8.5-2 - do not create static libraries (#556052)