- update to 0.14.6

- include preloadable_libintl.so again (Roozbeh Pournader, #149809)
- remove .la files (Kjartan Maraas, #172624)
- cleanup spec file
This commit is contained in:
Jens Petersen 2006-08-07 08:02:10 +00:00
parent 287467318c
commit c5659ca2ae
4 changed files with 65 additions and 60 deletions

View File

@ -1,3 +1 @@
gettext-0.14.1.tar.gz gettext-0.14.6.tar.gz
gettext-0.14.3.tar.gz
gettext-0.14.5.tar.gz

View File

@ -1,25 +1,19 @@
%define libtoolize :
%define install_info /sbin/install-info
%define remove_install_info /sbin/install-info --delete
Summary: GNU libraries and utilities for producing multi-lingual messages. Summary: GNU libraries and utilities for producing multi-lingual messages.
Name: gettext Name: gettext
Version: 0.14.5 Version: 0.14.6
Release: 4 Release: 1%{?dist}
License: GPL/LGPL License: GPL/LGPL
Group: Development/Tools Group: Development/Tools
Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
URL: http://www.gnu.org/software/gettext/ URL: http://www.gnu.org/software/gettext/
Source1: po-mode-init.el Source1: po-mode-init.el
Source2: msghack.py Source2: msghack.py
Patch1: gettext-0.14.3-gcc4.patch
#Patch2: gettext-0.14.1-tempfile.patch
Prereq: /sbin/install-info Prereq: /sbin/install-info
%ifarch x86_64 ppc64 s390x %ifarch x86_64 ppc64 s390x
BuildRequires: automake >= 1.8, autoconf >= 2.5 BuildRequires: automake >= 1.8, autoconf >= 2.5
%endif %endif
BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
BuildRequires: /usr/bin/fastjar BuildRequires: %{_bindir}/fastjar
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
%description %description
@ -34,29 +28,29 @@ library and tools for creating, using, and modifying natural language
catalogs and is a powerful and simple method for internationalizing catalogs and is a powerful and simple method for internationalizing
programs. programs.
%package devel
Summary: Development files for %{name}
Group: Development/Tools
License: LGPL
Requires: %{name} = %{version}-%{release}
Requires: cvs
Provides: devel(libintl)
Prereq: /sbin/install-info
%description devel %package devel
Summary: Development files for %{name}
Group: Development/Tools
License: LGPL
Requires: %{name} = %{version}-%{release}
Requires: cvs
Provides: devel(libintl)
PreReq: /sbin/install-info
%description devel
This package contains all development related files necessary for This package contains all development related files necessary for
developing or compiling applications/libraries that needs developing or compiling applications/libraries that needs
internationalization capability. You also need this package if you internationalization capability. You also need this package if you
want to add gettext support for your project. want to add gettext support for your project.
%prep %prep
rm -rf %{buildroot}
%setup -q %setup -q
%patch1 -p1 -b .gcc4
#%patch2 -p1 -b .tempfile
%build %build
[ -f /usr/share/automake/depcomp ] && cp -f /usr/share/automake/{depcomp,ylwrap} . || : [ -f %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} . || :
# Rerun autotools for new version # Rerun autotools for new version
# aclocal --force # aclocal --force
@ -82,21 +76,21 @@ export JAR='fastjar'
--enable-shared --with-pic-=yes --disable-csharp --enable-shared --with-pic-=yes --disable-csharp
make make
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
# Fix busted no-emacs install for $lispdir/po-mode.el %makeinstall lispdir=${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp \
%makeinstall lispdir=%{buildroot}/usr/share/emacs/site-lisp \ aclocaldir=${RPM_BUILD_ROOT}%{_datadir}/aclocal
aclocaldir=%{buildroot}/usr/share/aclocal
mkdir -p %{buildroot}/bin # move gettext to /bin
mv %{buildroot}/%{_bindir}/gettext %{buildroot}/bin mkdir -p ${RPM_BUILD_ROOT}/bin
ln -s ../../bin/gettext %{buildroot}/%{_bindir}/gettext mv ${RPM_BUILD_ROOT}%{_bindir}/gettext ${RPM_BUILD_ROOT}/bin
install -m 755 %SOURCE2 $RPM_BUILD_ROOT/%{_bindir}/msghack ln -s ../../bin/gettext ${RPM_BUILD_ROOT}%{_bindir}/gettext
pushd %{buildroot} install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
rm -f .%{_infodir}/dir .%{_includedir}/libintl.h
popd rm ${RPM_BUILD_ROOT}%{_infodir}/dir
pushd %{buildroot}/%{_datadir}/locale pushd %{buildroot}/%{_datadir}/locale
for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do
@ -106,42 +100,47 @@ for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do
done done
popd popd
mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
# doc relocations # doc relocations
for i in gettext-runtime/man/*.html; do for i in gettext-runtime/man/*.html; do
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/gettext/`basename $i` rm ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/`basename $i`
done done
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gettext/javadoc* rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/javadoc*
rm -rf htmldoc examples rm -rf htmldoc examples
mkdir htmldoc mkdir htmldoc
mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/examples examples mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/examples examples
mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/* $RPM_BUILD_ROOT/%{_datadir}/doc/libasprintf/* htmldoc mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}/%{_datadir}/doc/libasprintf/* htmldoc
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libasprintf rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gettext rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
# remove unpackaged files from the buildroot # remove unpackaged files from the buildroot
rm -rf $RPM_BUILD_ROOT/usr/doc rm -r ${RPM_BUILD_ROOT}%{_datadir}/emacs
rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
rm -rf $RPM_BUILD_ROOT%{_libdir}/preloadable_libintl.so
%clean %clean
rm -rf %{buildroot} rm -rf ${RPM_BUILD_ROOT}
%define install_info /sbin/install-info
%define remove_install_info /sbin/install-info --delete
%post %post
/sbin/ldconfig /sbin/ldconfig
%{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir %{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir
%preun %preun
if [ "$1" = 0 ]; then if [ "$1" = 0 ]; then
%{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir %{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir
fi fi
exit 0 exit 0
%postun %postun
/sbin/ldconfig /sbin/ldconfig
@ -150,11 +149,13 @@ exit 0
/sbin/ldconfig /sbin/ldconfig
%{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir %{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
%preun devel %preun devel
if [ "$1" = 0 ]; then if [ "$1" = 0 ]; then
%{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir %{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
fi fi
%postun devel %postun devel
/sbin/ldconfig /sbin/ldconfig
@ -167,18 +168,19 @@ fi
%doc gettext-runtime/man/*.1.html %doc gettext-runtime/man/*.1.html
%doc gettext-runtime/intl/COPYING* %doc gettext-runtime/intl/COPYING*
/bin/* /bin/*
/usr/bin/* %{_bindir}/*
%exclude %{_bindir}/autopoint %exclude %{_bindir}/autopoint
%exclude %{_bindir}/gettextize %exclude %{_bindir}/gettextize
# These aren't in glibc... # These aren't in glibc...
%dir /usr/share/locale/en@boldquot %dir %{_datadir}/locale/en@boldquot
%dir /usr/share/locale/en@boldquot/LC_MESSAGES %dir %{_datadir}/locale/en@boldquot/LC_MESSAGES
%dir /usr/share/locale/en@quot %dir %{_datadir}/locale/en@quot
%dir /usr/share/locale/en@quot/LC_MESSAGES %dir %{_datadir}/locale/en@quot/LC_MESSAGES
%{_libdir}/libgettextlib*.so %{_libdir}/libgettextlib*.so
%{_libdir}/libgettextsrc*.so %{_libdir}/libgettextsrc*.so
%{_libdir}/preloadable_libintl.so
%{_infodir}/gettext* %{_infodir}/gettext*
%{_mandir}/man1/* %{_mandir}/man1/*
%exclude %{_mandir}/man1/gettextize.1.gz %exclude %{_mandir}/man1/gettextize.1.gz
@ -207,7 +209,6 @@ fi
%{_includedir}/* %{_includedir}/*
%{_infodir}/autosprintf* %{_infodir}/autosprintf*
%{_libdir}/lib*.a %{_libdir}/lib*.a
%{_libdir}/lib*.la
%{_libdir}/libasprintf.so* %{_libdir}/libasprintf.so*
%{_libdir}/libgettextpo.so* %{_libdir}/libgettextpo.so*
%{_mandir}/man1/gettextize.1.gz %{_mandir}/man1/gettextize.1.gz
@ -217,7 +218,14 @@ fi
%doc gettext-runtime/intl-java/javadoc* %doc gettext-runtime/intl-java/javadoc*
%{_libdir}/%{name}/gnu.gettext.* %{_libdir}/%{name}/gnu.gettext.*
%changelog %changelog
* Mon Aug 7 2006 Jens Petersen <petersen@redhat.com> - 0.14.6-1
- update to 0.14.6
- include preloadable_libintl.so again (Roozbeh Pournader, #149809)
- remove .la files (Kjartan Maraas, #172624)
- cleanup spec file
* Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim@redhat.com> - 0.14.5-4 * Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim@redhat.com> - 0.14.5-4
- Bump release number. - Bump release number.
@ -260,7 +268,7 @@ fi
* Wed Dec 01 2004 Leon Ho <llch@redhat.com> * Wed Dec 01 2004 Leon Ho <llch@redhat.com>
- Add env var to redirect use fastjar instead of jar - Add env var to redirect use fastjar instead of jar
- BuildRequires /usr/bin/fastjar and libgcj - BuildRequires %{_bindir}/fastjar and libgcj
* Mon Nov 01 2004 Leon Ho <llch@redhat.com> * Mon Nov 01 2004 Leon Ho <llch@redhat.com>
- fix call on phase0_getc() - fix call on phase0_getc()

View File

@ -1,11 +1,10 @@
;; Use po-mode for translation files ;;; po-mode-init.el
(autoload 'po-mode "po-mode") (autoload 'po-mode "po-mode")
(setq auto-mode-alist (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode) (setq auto-mode-alist (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode)
auto-mode-alist)) auto-mode-alist))
;;; To automatically use proper fonts under Emacs 20, also add: ;; autodetect coding-system
(autoload 'po-find-file-coding-system "po-mode") (autoload 'po-find-file-coding-system "po-mode")
(modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\." (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\."
'po-find-file-coding-system) 'po-find-file-coding-system)

View File

@ -1 +1 @@
e2f6581626a22a0de66dce1d81d00de3 gettext-0.14.5.tar.gz c26fc7f0a493c5c7c39bbc4e7ed42790 gettext-0.14.6.tar.gz