From 5a944c302009841769fb71a9f04fbc9dbb2b2578 Mon Sep 17 00:00:00 2001 From: jorton Date: Tue, 10 Mar 2009 08:41:11 +0000 Subject: [PATCH] - update to 1.9 (#302111) - update License to reflect GPLv3+ binaries, LGPLv2+ library --- .cvsignore | 5 +---- libidn-0.6.14-aconf262.patch | 18 ------------------ libidn-0.6.14-include-next.patch | 12 ------------ libidn-1.9.tar.gz.sig | 10 ++++++++++ libidn.spec | 18 ++++++++---------- mirrors | 2 +- sources | 2 +- upstream | 2 +- 8 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 libidn-0.6.14-aconf262.patch delete mode 100644 libidn-0.6.14-include-next.patch create mode 100644 libidn-1.9.tar.gz.sig diff --git a/.cvsignore b/.cvsignore index 75a56d3..5cb2153 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1 @@ -libidn-0.6.14.tar.gz -libidn-0.6.14 -x86_64 -clog +libidn-1.9.tar.gz diff --git a/libidn-0.6.14-aconf262.patch b/libidn-0.6.14-aconf262.patch deleted file mode 100644 index 766c129..0000000 --- a/libidn-0.6.14-aconf262.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- libidn-0.6.14/lib/gl/m4/extensions.m4.aconf262 -+++ libidn-0.6.14/lib/gl/m4/extensions.m4 -@@ -16,6 +16,7 @@ - # ------------------------ - # Enable extensions on systems that normally disable them, - # typically due to standards-conformance issues. -+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS], [ - AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], - [ - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) -@@ -49,6 +50,7 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) - AC_DEFINE([_TANDEM_SOURCE]) - ]) -+]) - - # gl_USE_SYSTEM_EXTENSIONS - # ------------------------ diff --git a/libidn-0.6.14-include-next.patch b/libidn-0.6.14-include-next.patch deleted file mode 100644 index d28ea9d..0000000 --- a/libidn-0.6.14-include-next.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp libidn-0.6.14.orig/lib/Makefile.am libidn-0.6.14/lib/Makefile.am ---- libidn-0.6.14.orig/lib/Makefile.am 2007-05-31 06:31:00.000000000 -0400 -+++ libidn-0.6.14/lib/Makefile.am 2008-12-16 00:25:12.000000000 -0500 -@@ -37,7 +37,7 @@ nodist_include_HEADERS = $(idn_int) - - idn-int.h: - if test -n "$(STDINT_H)"; then \ -- cp gl/stdint.h idn-int.h; \ -+ sed -e s/include_next/include/ gl/stdint.h > idn-int.h; \ - else \ - echo '#include ' > idn-int.h; \ - fi diff --git a/libidn-1.9.tar.gz.sig b/libidn-1.9.tar.gz.sig new file mode 100644 index 0000000..f1f914a --- /dev/null +++ b/libidn-1.9.tar.gz.sig @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iOoEAAECADQFAkhqWXotFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz +QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvjn8E/iCct48j/lxCfxz7VCCHH/zad/EA +3bfxHbo8zO7I3pdk4a/Q7pOM5mXWqmf87YVfkx513WMNKs+4QjnzM9bhUUeayMEm +njEFVGN3b6qMpVQxco58ztHZOsfdu9SfZ81qyM1234CXVzEkbsJe065xqCoRmX1Y +SZbNKWfHme6prO9nkAPQ2YLRXFPfkklB0dR4GxVcsUJ0Pp0hoyobb6i+ouU= +=ABeW +-----END PGP SIGNATURE----- diff --git a/libidn.spec b/libidn.spec index c806311..4e89ef0 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,12 +1,10 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.14 -Release: 10 +Version: 1.9 +Release: 1 URL: http://www.gnu.org/software/libidn/ -License: LGPLv2+ +License: LGPLv2+ and GPLv3+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz -Patch0: libidn-0.6.14-aconf262.patch -Patch1: libidn-0.6.14-include-next.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig, gettext, libtool, autoconf @@ -33,8 +31,6 @@ developing programs which use the GNU libidn library. %prep %setup -q -%patch0 -p1 -b .aconf262 -%patch1 -p1 -b .include-next-fix # Name directory sections consistently in the info file, #209491 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info @@ -44,9 +40,7 @@ mv iconv.tmp doc/libidn.info %build # Must re-bootstrap to get multilib-aware libtool -libtoolize --force --copy -aclocal -I m4 -I gl/m4 -I lib/gl/m4 -autoheader && autoconf && automake +autoreconf %configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} @@ -114,6 +108,10 @@ rm -rf %{buildroot} %{_mandir}/man3/* %changelog +* Tue Mar 10 2009 Joe Orton 1.9-1 +- update to 1.9 (#302111) +- update License to reflect GPLv3+ binaries, LGPLv2+ library + * Wed Feb 25 2009 Fedora Release Engineering - 0.6.14-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/mirrors b/mirrors index 583b40f..c233239 100644 --- a/mirrors +++ b/mirrors @@ -1 +1 @@ -http://josefsson.org/libidn/releases/ +http://ftp.gnu.org/gnu/libidn/ diff --git a/sources b/sources index 08cf30c..a67a56a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -040f012a45feb56168853998bb87ad4d libidn-0.6.14.tar.gz +f4d794639564256a367566302611224e libidn-1.9.tar.gz diff --git a/upstream b/upstream index 2e2fd4d..5cb2153 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -libidn-0.6.14.tar.gz +libidn-1.9.tar.gz