From bc1d041468fecb3736b13f5b111c43c400e8c170 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Fri, 27 Jan 2017 01:47:47 +0100 Subject: [PATCH] Upgrade to 0.16 (#1416642) --- .gitignore | 2 +- ....3-rpath.patch => libidn2-0.16-rpath.patch | 33 +++++-------------- libidn2.spec | 17 ++++++---- sources | 2 +- 4 files changed, 20 insertions(+), 34 deletions(-) rename libidn2-0.3-rpath.patch => libidn2-0.16-rpath.patch (74%) diff --git a/.gitignore b/.gitignore index e7eedb4..4af0792 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libidn2-*.tar.gz +/libidn2-*.tar.gz diff --git a/libidn2-0.3-rpath.patch b/libidn2-0.16-rpath.patch similarity index 74% rename from libidn2-0.3-rpath.patch rename to libidn2-0.16-rpath.patch index 2ea427e..0a227cc 100644 --- a/libidn2-0.3-rpath.patch +++ b/libidn2-0.16-rpath.patch @@ -1,4 +1,4 @@ -Patch by Robert Scheck for libidn2 >= 0.3, which works +Patch by Robert Scheck for libidn2 >= 0.16, which works around the broken libtool of Debian. Multilib/multiarch systems like Fedora or Red Hat Enterprise Linux are using /usr/lib64 for 64 bit libraries and /usr/lib is used for 32 bit libraries. That allows to run 32 bit software on 64 bit systems. Debian @@ -26,7 +26,7 @@ hunks are runtime-only if configure file has been already generated) or by runni the following sed command after each aclocal run within the upstream build system: sed -e 's@\(# Append ld.so.conf contents to the search path\)@# Add ABI-specific directories to the system library path.\n sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"\n\n \1@' \ - -e 's@/lib /usr/lib $lt_ld_extra@$sys_lib_dlsearch_path_spec $lt_ld_extra@' -i libidn2-0.3/m4/libtool.m4 + -e 's@/lib /usr/lib $lt_ld_extra@$sys_lib_dlsearch_path_spec $lt_ld_extra@' -i libidn2-0.16/m4/libtool.m4 More information regarding this topic can be found for example at: @@ -34,9 +34,9 @@ More information regarding this topic can be found for example at: - http://lists.gnu.org/archive/html/libtool/2009-01/msg00039.html - http://thread.gmane.org/gmane.comp.gnu.libtool.general/8339/focus=8345 ---- libidn2-0.3/configure 2011-04-20 01:23:30.000000000 +0200 -+++ libidn2-0.3/configure.rpath 2011-05-07 20:23:02.606829209 +0200 -@@ -10703,10 +10703,13 @@ +--- libidn2-0.16/configure 2017-01-16 08:44:58.000000000 +0100 ++++ libidn2-0.16/configure.rpath 2017-01-27 01:33:19.957032530 +0100 +@@ -12363,10 +12363,13 @@ # before this can be enabled. hardcode_into_libs=yes @@ -51,26 +51,9 @@ More information regarding this topic can be found for example at: fi # We used to test for /lib/ld.so.1 and disable shared libraries on ---- libidn2-0.3/src/configure 2011-04-20 01:23:54.000000000 +0200 -+++ libidn2-0.3/src/configure.rpath 2011-05-07 20:24:25.959753622 +0200 -@@ -10486,10 +10486,13 @@ - # before this can be enabled. - hardcode_into_libs=yes - -+ # Add ABI-specific directories to the system library path. -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -+ - # 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;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on ---- libidn2-0.3/m4/libtool.m4 2011-04-20 01:23:26.000000000 +0200 -+++ libidn2-0.3/m4/libtool.m4.rpath 2011-05-07 20:23:47.214717341 +0200 -@@ -2474,10 +2474,13 @@ +--- libidn2-0.16/m4/libtool.m4 2017-01-16 08:44:18.000000000 +0100 ++++ libidn2-0.16/m4/libtool.m4.rpath 2017-01-27 01:34:19.469749808 +0100 +@@ -2672,10 +2672,13 @@ # before this can be enabled. hardcode_into_libs=yes diff --git a/libidn2.spec b/libidn2.spec index c0fa7f9..8a32269 100644 --- a/libidn2.spec +++ b/libidn2.spec @@ -1,12 +1,13 @@ Summary: Library to support IDNA2008 internationalized domain names Name: libidn2 -Version: 0.11 +Version: 0.16 Release: 1%{?dist} License: (GPLv2+ or LGPLv3+) and GPLv3+ Group: System Environment/Libraries -URL: http://www.gnu.org/software/libidn/#libidn2 -Source: http://alpha.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz -Patch0: libidn2-0.3-rpath.patch +URL: https://www.gnu.org/software/libidn/#libidn2 +Source: https://alpha.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz +Patch0: libidn2-0.16-rpath.patch +BuildRequires: libunistring-devel Requires(post): /sbin/install-info, /sbin/ldconfig Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig @@ -15,8 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Libidn2 is an implementation of the IDNA2008 specifications in RFC -5890, 5891, 5892 and 5893 for internationalized domain names (IDN). -It is a standalone library, without any dependency on libidn. +5890, 5891, 5892, 5893 and TR46 for internationalized domain names +(IDN). It is a standalone library, without any dependency on libidn. %package devel Summary: Development files for libidn2 @@ -31,7 +32,6 @@ developing applications that use libidn2. %setup -q %patch0 -p1 -b .rpath touch -c -r configure.rpath configure -touch -c -r src/configure.rpath src/configure touch -c -r m4/libtool.m4.rpath m4/libtool.m4 %build @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/ %changelog +* Fri Jan 27 2017 Robert Scheck 0.16-1 +- Upgrade to 0.16 (#1416642) + * Mon Nov 21 2016 Robert Scheck 0.11-1 - Upgrade to 0.11 - Reflect dual-licensing of library in license tag (#1397021) diff --git a/sources b/sources index db178ee..0e30595 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5a572bfd1d5d0ecc2314b61f53596f5 libidn2-0.11.tar.gz +SHA512 (libidn2-0.16.tar.gz) = 85f41c79bd2b88f2724383461a78e56b47e52e66e3f088d631a922438742938721d26aeebef17f6ca4fd028d95dfb5b0fa298a96982ef777c07fefe5244d1e73