From 7d03879706a10907969f29e50cba694c3aca8f8d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 Oct 2006 08:58:39 +0000 Subject: [PATCH] buildrequire zip and unzip to fix libintl.jar multilib conflict (#205207) --- gettext.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gettext.spec b/gettext.spec index b8faead..1795c61 100644 --- a/gettext.spec +++ b/gettext.spec @@ -1,7 +1,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.14.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz @@ -14,6 +14,8 @@ BuildRequires: automake >= 1.8, autoconf >= 2.5 %endif BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj BuildRequires: %{_bindir}/fastjar +# require zip and unzip for brp-java-repack-jars +BuildRequires: zip, unzip Buildroot: %{_tmppath}/%{name}-%{version}-root %description @@ -222,6 +224,9 @@ fi %changelog +* Mon Oct 2 2006 Jens Petersen - 0.14.6-3 +- buildrequire zip and unzip to fix libintl.jar multilib conflict (#205207) + * Fri Aug 25 2006 Jens Petersen - 0.14.6-2 - move libgettext*.so devel files to devel package (Patrice Dumas, #203622)