From 0bddcbb398a28475c494cb1aada54a5ab9deed6d Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 28 Jul 2020 08:54:55 +0200 Subject: [PATCH] update to 1.36 --- .gitignore | 2 +- libidn-jar.patch | 29 ----------------------------- libidn.spec | 5 +---- sources | 2 +- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 libidn-jar.patch diff --git a/.gitignore b/.gitignore index 6fbf1fe..dbe8c37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libidn-1.?? -/libidn-1.35.tar.gz +/libidn-1.36.tar.gz diff --git a/libidn-jar.patch b/libidn-jar.patch deleted file mode 100644 index 424d5e4..0000000 --- a/libidn-jar.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit d19cfa1589ae4718b9f6d67a175d6e2868e4b8b8 -Author: Simon Josefsson -Date: Tue Apr 28 16:58:37 2020 +0200 - - Fix libidn.jar building with non-gcj. - -diff --git a/java/Makefile.am b/java/Makefile.am -index 1bb706fa..3d72989c 100644 ---- a/java/Makefile.am -+++ b/java/Makefile.am -@@ -46,16 +46,14 @@ libidn-$(VERSION).jar: - gnu/inet/encoding/Punycode.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/PunycodeException.class \ -- -C $(builddir)/src/main/java \ -- gnu/inet/encoding/RangeSet\$$1.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RangeSet\$$Builder.class \ -- -C $(builddir)/src/main/java \ -- gnu/inet/encoding/RangeSet.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RangeSet\$$Range.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RangeSet\$$RangeContainsComparator.class \ -+ -C $(builddir)/src/main/java \ -+ gnu/inet/encoding/RangeSet.class \ - -C $(builddir)/src/main/java \ - gnu/inet/encoding/RFC3454.class \ - -C $(builddir)/src/main/java \ diff --git a/libidn.spec b/libidn.spec index 47ed6cc..d1550f2 100644 --- a/libidn.spec +++ b/libidn.spec @@ -5,15 +5,13 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 1.35 +Version: 1.36 Release: 10%{?dist} URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ and GPLv3+ and GFDL Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch -# Fix build with JDK11 -Patch1: libidn-jar.patch BuildRequires: autoconf autoconf-archive BuildRequires: automake @@ -78,7 +76,6 @@ This package contains javadoc for %{name}-java. %prep %setup -q %patch0 -p1 -%patch1 -p1 autoreconf -vif # Prevent from regenerating sources by gengetopt because it's broken. touch src/idn_cmd.c src/idn_cmd.h diff --git a/sources b/sources index 71a3d21..8b3c430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libidn-1.35.tar.gz) = 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09 +SHA512 (libidn-1.36.tar.gz) = 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad