From 1ff6615655e036460163543882933af6d6199458 Mon Sep 17 00:00:00 2001 From: Leon Ho Date: Mon, 21 Mar 2005 07:03:22 +0000 Subject: [PATCH] - fixed compiling problme on gcc4 (#150992) - fixed Group for -devel (#138303) - moved gettextize and autopoint to -deel (#137542, #145768) - moved some of the man pages --- .cvsignore | 1 + gettext.spec | 33 ++++++++++++++++++++++++--------- sources | 1 + 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0902bb4..8322977 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ gettext-0.14.1.tar.gz +gettext-0.14.3.tar.gz diff --git a/gettext.spec b/gettext.spec index c51f1e9..b05671b 100644 --- a/gettext.spec +++ b/gettext.spec @@ -4,8 +4,8 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext -Version: 0.14.1 -Release: 14 +Version: 0.14.3 +Release: 1 License: GPL/LGPL Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz @@ -13,8 +13,9 @@ URL: http://www.gnu.org/software/gettext/ Source1: po-mode-init.el Source2: msghack.py Patch0: gettext-0.14.1-amd64-libtool.patch -Patch1: gettext-0.14.1-phase0getc.patch -Patch2: gettext-0.14.1-tempfile.patch +Patch1: gettext-0.14.3-gcc4.patch +#Patch1: gettext-0.14.1-phase0getc.patch +#Patch2: gettext-0.14.1-tempfile.patch Prereq: /sbin/install-info %ifarch x86_64 ppc64 s390x BuildRequires: automake >= 1.8, autoconf >= 2.5 @@ -37,7 +38,7 @@ programs. %package devel Summary: Development files for %{name} -Group: Development/C +Group: Development/Tools License: LGPL Requires: %{name} = %{version}-%{release} Provides: devel(libintl) @@ -55,8 +56,9 @@ rm -rf %{buildroot} %ifarch x86_64 ppc64 s390x %patch0 -p1 -b .x86_64 %endif -%patch1 -p1 -b .phasegetc -%patch2 -p1 -b .tempfile +%patch1 -p1 -b .gcc4 +#%patch1 -p1 -b .phasegetc +#%patch2 -p1 -b .tempfile %build [ -f /usr/share/automake/depcomp ] && cp -f /usr/share/automake/{depcomp,ylwrap} . || : @@ -166,11 +168,13 @@ fi %defattr(-,root,root) %doc gettext-runtime/ABOUT-NLS AUTHORS gettext-runtime/BUGS %doc COPYING gettext-tools/misc/DISCLAIM README -%doc NEWS THANKS gettext-tools/TODO +%doc NEWS THANKS %doc gettext-runtime/man/*.1.html %doc gettext-runtime/intl/COPYING* /bin/* /usr/bin/* +%exclude %{_bindir}/autopoint +%exclude %{_bindir}/gettextize # These aren't in glibc... %dir /usr/share/locale/en@boldquot @@ -181,7 +185,9 @@ fi %{_libdir}/libgettextlib*.so %{_libdir}/libgettextsrc*.so %{_infodir}/gettext* -%{_mandir}/*/* +%{_mandir}/man1/* +%exclude %{_mandir}/man1/gettextize.1.gz +%exclude %{_mandir}/man1/autopoint.1.gz #%config %{_libdir}/charset.alias %{_libdir}/%{name} %exclude %{_libdir}/%{name}/gnu.gettext.* @@ -192,6 +198,7 @@ fi %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/projects %{_bindir}/gettextize +%{_bindir}/autopoint %{_datadir}/%{name}/ABOUT-NLS %{_datadir}/%{name}/projects/* %{_datadir}/%{name}/archive.tar.gz @@ -208,12 +215,20 @@ fi %{_libdir}/lib*.la %{_libdir}/libasprintf.so* %{_libdir}/libgettextpo.so* +%{_mandir}/man1/gettextize.1.gz +%{_mandir}/man1/autopoint.1.gz %{_mandir}/man3/* %{_datadir}/%{name}/libintl.jar %doc gettext-runtime/intl-java/javadoc* %{_libdir}/%{name}/gnu.gettext.* %changelog +* Mon Mar 21 2005 Leon Ho +- fixed compiling problme on gcc4 (#150992) +- fixed Group for -devel (#138303) +- moved gettextize and autopoint to -deel (#137542, #145768) +- moved some of the man pages + * Tue Mar 01 2005 Jakub Jelinek - rebuilt with gcc 4.0 diff --git a/sources b/sources index c38e6f2..ce5a647 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 78f4b862510beb2e5d43223dd610e77d gettext-0.14.1.tar.gz +14c2644c2f3b0eb67d5db7ee389547de gettext-0.14.3.tar.gz