diff --git a/libidn-1.42.tar.gz b/libidn-1.43.tar.gz similarity index 35% rename from libidn-1.42.tar.gz rename to libidn-1.43.tar.gz index f77a45d1a3147a4378d2bd09121dca229d9669b1..19c7219e0f8cae39c243bac0b47bafb599c5cf45 100644 Binary files a/libidn-1.42.tar.gz and b/libidn-1.43.tar.gz differ diff --git a/libidn-emacsopt.patch b/libidn-emacsopt.patch index 5c50a800c201f3ab6f9cf00f9371bcde4abe239b..8bced436d49537537ca3937bbb10f19f3879f0ad 100644 --- a/libidn-emacsopt.patch +++ b/libidn-emacsopt.patch @@ -16,18 +16,18 @@ Signed-off-by: Petr Písař 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 649ddcd..a6dc9ff 100644 +index 95f8461..7a3842d 100644 --- a/configure.ac +++ b/configure.ac -@@ -51,7 +51,6 @@ LT_INIT([win32-dll]) - AM_MISSING_PROG(PERL, perl, $missing_dir) - AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) +@@ -53,7 +53,6 @@ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) + AM_MISSING_PROG([DOT], [dot]) + AM_MISSING_PROG([GS], [gs]) AM_ICONV -AM_PATH_LISPDIR AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.19.8]) -@@ -100,6 +99,14 @@ AM_CONDITIONAL(JAVA, test "$enable_java" != "no") +@@ -102,6 +101,14 @@ AM_CONDITIONAL(JAVA, test "$enable_java" != "no") AC_MSG_CHECKING([if implementation in Java should be built]) AC_MSG_RESULT($enable_java) @@ -43,7 +43,7 @@ index 649ddcd..a6dc9ff 100644 if test -n "$HAVE_CSHARPCOMP"; then gt_CSHARPEXEC diff --git a/src/Makefile.am b/src/Makefile.am -index 6832c20..ec99560 100644 +index 5cb632d..3f14d0b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,9 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) diff --git a/libidn.spec b/libidn.spec index a0bdba3f21f2c67ffcdd0c15189b67c3207eee11..8fdab5006c47bcf2470064f34ab2d3a5f02fb9a7 100644 --- a/libidn.spec +++ b/libidn.spec @@ -3,18 +3,22 @@ %bcond_with java Name: libidn -Version: 1.42 +Version: 1.43 Release: 1 Summary: GNU IDN Library - Libidn -License: LGPLv2+ and GPLv3+ and GFDL-1.3-or-later -URL: http://www.gnu.org/software/libidn/ -Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz +License: (LGPL-3.0-or-later OR GPL-2.0-or-later) AND GPL-3.0-or-later AND GFDL-1.3-or-later +URL: https://www.gnu.org/software/libidn/ +Source0: https://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz # Allow disabling Emacs support Patch0: libidn-emacsopt.patch -BuildRequires: autoconf autoconf-archive automake libtool texinfo -BuildRequires: gcc gettext gettext-devel pkgconfig help2man +BuildRequires: autoconf autoconf-archive automake libtool +BuildRequires: /usr/bin/perl +BuildRequires: /usr/bin/help2man +BuildRequires: /usr/bin/dot +BuildRequires: /usr/bin/gs +BuildRequires: gcc gettext gettext-devel BuildRequires: gtk-doc %if %{with libidn_enables_emacs} BuildRequires: emacs @@ -34,7 +38,6 @@ Libidn's purpose is to encode and decode internationalized domain names. %package devel Summary: Development files for the libidn library Requires: %{name} = %{version}-%{release} -Requires: pkgconfig %description devel This package includes header files and libraries necessary for @@ -94,10 +97,9 @@ export LD_LIBRARY_PATH=$(pwd)/lib/.libs %install %make_install - +%delete_la rm -rf %{buildroot}%{_datadir}/info/dir -rm -rf %{buildroot}%{_libdir}/*.la \ - %{buildroot}%{_datadir}/info/*.png +rm -rf %{buildroot}%{_datadir}/info/*.png %if %{with libidn_enables_emacs} %{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el @@ -114,8 +116,6 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %find_lang %{name} -%ldconfig_scriptlets - %files -f %{name}.lang %license COPYING* %doc AUTHORS NEWS FAQ THANKS README @@ -140,11 +140,13 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar %endif %files help -%{_mandir}/man1/idn.1* -%{_mandir}/man3/* -%{_infodir}/%{name}.info.gz +%{_mandir}/man?/* +%{_infodir}/%{name}.info* %changelog +* Sat Mar 22 2025 Funda Wang - 1.43-1 +- update to 1.43 + * Mon Jul 29 2024 dillon chen - 1.42-1 - update version to 1.42 diff --git a/libidn.yaml b/libidn.yaml index 87457ccfc0e276563868a69c790d81e2b95f6cfd..c09bca4a1f28c25336049acbd63dfb1f00a269b1 100644 --- a/libidn.yaml +++ b/libidn.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://git.savannah.gnu.org/git/libidn.git -tag_prefix: ^libidn- -seperator: "-" +tag_prefix: ^v +separator: .