+++ /dev/null
---- gettext-0.17/gettext-tools/src/write-catalog.c.orig 2008-10-14 03:27:49.515344772 +0200
-+++ gettext-0.17/gettext-tools/src/write-catalog.c 2008-10-14 04:01:48.875184215 +0200
-@@ -220,7 +220,7 @@
- /* Open the output file. */
- if (!to_stdout)
- {
-- fd = open (filename, O_WRONLY | O_CREAT);
-+ fd = open (filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
- if (fd < 0)
- {
- const char *errno_description = strerror (errno);
+++ /dev/null
-diff -urN gettext-0.17.org/gettext-tools/misc/autopoint.in gettext-0.17/gettext-tools/misc/autopoint.in
---- gettext-0.17.org/gettext-tools/misc/autopoint.in 2007-11-07 03:53:58.000000000 +0100
-+++ gettext-0.17/gettext-tools/misc/autopoint.in 2009-08-19 14:10:49.914980544 +0200
-@@ -339,8 +339,6 @@
- # a severe restrictions, because most of the people who use autopoint are
- # users of CVS.
- #
--# Check availability of the CVS program.
--(cvs -v) >/dev/null 2>/dev/null || func_fatal_error "cvs program not found"
-
- # Check in which directory config.rpath, mkinstalldirs etc. belong.
- auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-@@ -381,17 +379,7 @@
- # Set variables
- # - cvs_dir directory containing the temporary repository
- # - work_dir directory containing the temporary checkout
--cvs_dir=tmpcvs$$
- work_dir=tmpwrk$$
--# Use an umask of 077, to avoid attacks that work by overwriting files in the
--# "$CVSROOT"/CVSROOT directory.
--(umask 077 && mkdir "$cvs_dir") || {
-- if test -d "$cvs_dir"; then
-- func_fatal_error "directory $cvs_dir already exists"
-- else
-- func_fatal_error "cannot create directory $cvs_dir"
-- fi
--}
- mkdir "$work_dir" || {
- if test -d "$work_dir"; then
- func_fatal_error "directory $work_dir already exists"
-@@ -399,34 +387,13 @@
- func_fatal_error "cannot create directory $work_dir"
- fi
- }
--CVSROOT="$srcdir/$cvs_dir"
--export CVSROOT
--unset CVS_CLIENT_LOG
--unset CVS_CLIENT_PORT
--unset CVS_IGNORE_REMOTE_ROOT
--unset CVS_PASSFILE
--unset CVS_PASSWORD
--unset CVS_RCMD_PORT
--unset CVS_RSH
--unset CVS_SERVER
--unset CVS_SERVER_SLEEP
--unset CVSIGNORE
--unset CVSREAD
--unset CVSUMASK
--unset CVSWRAPPERS
--
--# Need to pass -d "$CVSROOT", because there may be a CVS directory in the
--# current directory.
--cvs -d "$CVSROOT" init
--gzip -d -c < "$gettext_dir/archive.tar.gz" | (cd "$cvs_dir" && tar xf -)
-
- cd "$work_dir"
- cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
--(cvs checkout -r"$cvsver" archive > /dev/null) 2>&1 | grep -v '^cvs checkout: Updating'
--find archive -name CVS -type d -print | xargs rm -rf
--if test `find archive -type f -print | wc -l` = 0; then
-- cd ..
-- rm -rf "$cvs_dir" "$work_dir"
-+if test -f "$gettext_dir/archive-$cvsver.tar.gz"; then
-+ tar xzf "$gettext_dir/archive-$cvsver.tar.gz"
-+else
-+ rm -rf "$work_dir"
- func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
- fi
- cd ..
-@@ -489,7 +456,7 @@
- fi
- done
- if test -n "$mismatch"; then
-- rm -rf "$cvs_dir" "$work_dir"
-+ rm -rf "$work_dir"
- func_fatal_error "Some files have been locally modified. Not overwriting them because --force has not been specified. For your convenience, you find the local modifications in the file '$mismatchfile'."
- fi
- rm -rf "$tmp"
---- gettext-0.17/gettext-tools/doc/gettext.texi.orig 2007-10-31 13:34:45.000000000 +0100
-+++ gettext-0.17/gettext-tools/doc/gettext.texi 2007-11-07 22:18:00.237953165 +0100
+--- gettext-0.18/gettext-tools/doc/gettext.texi.orig 2010-04-25 16:05:51.000000000 +0200
++++ gettext-0.18/gettext-tools/doc/gettext.texi 2010-05-16 09:00:10.514936746 +0200
@@ -47,30 +47,30 @@
@include version.texi
@end direntry
@end ifinfo
-@@ -216,16 +216,16 @@
+@@ -214,16 +214,16 @@
Making the PO Template File
Editing PO Files
-@@ -257,16 +257,16 @@
+@@ -255,16 +255,16 @@
Manipulating PO Files
* Colorizing:: Highlighting parts of PO files
* libgettextpo:: Writing your own programs that process PO files
-@@ -280,8 +280,8 @@
+@@ -278,8 +278,8 @@
Producing Binary MO Files
* MO Files:: The Format of GNU MO Files
The Programmer's View
-@@ -339,7 +339,7 @@
+@@ -338,7 +338,7 @@
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.ac}
* CVS Issues:: Integrating with CVS
-@@ -374,7 +374,7 @@
+@@ -373,7 +373,7 @@
* Distributed CVS:: Avoiding version mismatch in distributed development
* Files under CVS:: Files to put under CVS version control
Other Programming Languages
-@@ -438,10 +438,10 @@
+@@ -439,10 +439,10 @@
* Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization
* gettext.sh:: Contents of @code{gettext.sh}
* gettext Invocation:: Invoking the @code{gettext} program
Perl
-@@ -987,7 +987,7 @@
+@@ -988,7 +988,7 @@
exactly where in C sources each string is used. All translations
are set to empty. The letter @code{t} in @file{.pot} marks this as
a Template PO file, not yet oriented towards any particular language.
@code{xgettext} program. If you are @emph{really} lazy, you might
be interested at working a lot more right away, and preparing the
whole distribution setup (@pxref{Maintainers}). By doing so, you
-@@ -1062,7 +1062,7 @@
+@@ -1063,7 +1063,7 @@
which are no longer used in the program sources (@pxref{Obsolete
Entries}). It finally discovers new strings and inserts them in
the resulting PO file as untranslated entries (@pxref{Untranslated
@code{msgmerge} really does.
Whatever route or means taken, the goal is to obtain an updated
-@@ -1086,8 +1086,8 @@
+@@ -1087,8 +1087,8 @@
Once the PO file is complete and dependable, the @code{msgfmt} program
is used for turning the PO file into a machine-oriented format, which
may yield efficient retrieval of translations by the programs of the
for the @code{msgfmt} program.
Finally, the modified and marked C sources are compiled and linked
-@@ -1482,7 +1482,7 @@
+@@ -1483,7 +1483,7 @@
- In case the @code{c-format} flag is given for a string the @code{msgfmt}
- does some more tests to check to validity of the translation.
+ When the @code{c-format} flag is given for a string the @code{msgfmt}
+ program does some more tests to check the validity of the translation.
-@xref{msgfmt Invocation}, @ref{c-format Flag} and @ref{c-format}.
+@xref{msgfmt}, @ref{c-format Flag} and @ref{c-format}.
@item objc-format
@kwindex objc-format@r{ flag}
-@@ -2474,7 +2474,7 @@
+@@ -2501,7 +2501,7 @@
If a string is marked with @code{c-format} and this is not correct the
user can find out who is responsible for the decision. See
used for solving this problem.
@node Special cases, Bug Report Address, c-format Flag, Sources
-@@ -2506,7 +2506,7 @@
+@@ -2533,7 +2533,7 @@
While it is no problem to mark the string @code{"a default message"} it
is not possible to mark the string initializers for @code{messages}.
What is to be done? We have to fulfill two tasks. First we have to mark the
can find them, and second we have to translate the string at runtime
before printing them.
-@@ -2536,8 +2536,7 @@
+@@ -2563,8 +2563,7 @@
Please convince yourself that the string which is written by
@code{fputs} is translated in any case. How to get @code{xgettext} know
The above is of course not the only solution. You could also come along
with the following one:
-@@ -2813,10 +2812,10 @@
+@@ -2860,10 +2859,10 @@
@c FIXME: Rewrite.
@menu
@section Invoking the @code{xgettext} Program
@include xgettext.texi
-@@ -2845,16 +2844,16 @@
+@@ -2892,16 +2891,16 @@
the header entry of this file.
@menu
@section Filling in the Header Entry
@cindex header entry of a PO file
-@@ -3028,10 +3027,10 @@
+@@ -3128,10 +3127,10 @@
@chapter Updating Existing PO Files
@menu
@section Invoking the @code{msgmerge} Program
@include msgmerge.texi
-@@ -4571,71 +4570,71 @@
+@@ -4671,71 +4670,71 @@
write other specialized programs that process PO files.
@menu
@section Highlighting parts of PO files
Translators are usually only interested in seeing the untranslated and
-@@ -5165,22 +5164,22 @@
+@@ -5265,22 +5264,22 @@
@c FIXME: Rewrite.
@menu
@section The Format of GNU MO Files
@cindex MO file's format
@cindex file format, @file{.mo}
-@@ -7250,7 +7249,7 @@
+@@ -7521,7 +7520,7 @@
@menu
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.ac}
* CVS Issues:: Integrating with CVS
-@@ -7283,7 +7282,7 @@
+@@ -7554,7 +7553,7 @@
described in the remaining of this chapter. Some maintainers might
use this as an opportunity to unflatten their package structure.
@section Prerequisite Works
@cindex converting a package to use @code{gettext}
@cindex migration from earlier versions of @code{gettext}
-@@ -7368,12 +7367,12 @@
+@@ -7639,12 +7638,12 @@
a maintainer, ever think there is a real problem with a team, please
never try to @emph{solve} a team's problem on your own.
@section Files You Must Create or Alter
@cindex @code{gettext} files
-@@ -7536,7 +7535,7 @@
+@@ -7807,7 +7806,7 @@
Similarly, you can create rules for building message catalogs for the
@file{sr@@latin} locale -- Serbian written with the Latin alphabet --
from those for the @file{sr} locale -- Serbian written with Cyrillic
@node configure.ac, config.guess, po/Rules-*, Adjusting Files
@subsection @file{configure.ac} at top level
-@@ -8258,7 +8257,7 @@
+@@ -8539,7 +8538,7 @@
to instruct @code{xgettext} to mark all translatable strings in @samp{gettext}
invocations that occur as fifth argument to this function as @samp{c-format}.
accepts.
The use of this macro is an alternative to the use of the
-@@ -8326,7 +8325,7 @@
+@@ -8607,7 +8606,7 @@
@menu
* Distributed CVS:: Avoiding version mismatch in distributed development
* Files under CVS:: Files to put under CVS version control
@end menu
@node Distributed CVS, Files under CVS, CVS Issues, CVS Issues
-@@ -8368,7 +8367,7 @@
+@@ -8649,7 +8648,7 @@
undiscovered due to this constellation.
@end itemize
@subsection Files to put under CVS version control
There are basically three ways to deal with generated files in the
-@@ -8447,7 +8446,7 @@
+@@ -8728,7 +8727,7 @@
use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer
installed.
@subsection Invoking the @code{autopoint} Program
@include autopoint.texi
-@@ -9122,10 +9121,10 @@
+@@ -9426,10 +9425,10 @@
* Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization
* gettext.sh:: Contents of @code{gettext.sh}
* gettext Invocation:: Invoking the @code{gettext} program
@end menu
@node Preparing Shell Scripts, gettext.sh, sh, sh
-@@ -9146,8 +9145,8 @@
+@@ -9450,8 +9449,8 @@
near the top of the script. @code{gettext.sh} is a shell function library
that provides the functions
You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
@item
-@@ -9257,28 +9256,28 @@
+@@ -9561,13 +9560,13 @@
and a newline, without interpreting backslashes in the argument string.
@item eval_gettext
@subsubsection Invoking the @code{gettext} program
@include rt-gettext.texi
+@@ -9576,7 +9575,7 @@
+ @code{gettext} invocation, where no options are present and the
+ @var{textdomain} is implicit, from the environment.
-@node ngettext Invocation, envsubst Invocation, gettext Invocation, sh
+@node ngettext, envsubst, gettext Invocation, sh
@subsubsection Invoking the @code{ngettext} program
@include rt-ngettext.texi
+@@ -9585,12 +9584,12 @@
+ @code{ngettext} invocation, where no options are present and the
+ @var{textdomain} is implicit, from the environment.
-@node envsubst Invocation, eval_gettext Invocation, ngettext Invocation, sh
+@node envsubst, eval_gettext, ngettext, sh
@subsubsection Invoking the @code{eval_gettext} function
@cindex @code{eval_gettext} function, usage
-@@ -9291,7 +9290,7 @@
+@@ -9603,7 +9602,7 @@
performing dollar-substitution on the result. Note that only shell variables
mentioned in @var{msgid} will be dollar-substituted in the result.
---- gettext-0.16.1/gettext-runtime/configure.ac.orig 2007-01-06 23:57:05.000000000 +0000
-+++ gettext-0.16.1/gettext-runtime/configure.ac 2007-01-06 23:57:11.000000000 +0000
+--- gettext-0.18/gettext-runtime/configure.ac.orig 2010-03-29 00:06:07.000000000 +0200
++++ gettext-0.18/gettext-runtime/configure.ac 2010-05-16 09:05:06.198932556 +0200
@@ -35,7 +35,7 @@
gt_JAVA_CHOICE
-gt_JAVACOMP([1.3], [1.1])
+gt_JAVACOMP([1.3], [1.4])
- AC_CHECK_PROG(JAR, jar, jar)
+ AC_CHECK_PROG([JAR], [jar], [jar])
if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
BUILDJAVA=yes
+++ /dev/null
-diff -urN gettext-0.17.org/gettext-tools/gnulib-m4/openmp.m4 gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
---- gettext-0.17.org/gettext-tools/gnulib-m4/openmp.m4 2007-05-27 21:50:22.000000000 +0200
-+++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2009-08-19 14:33:04.694430366 +0200
-@@ -1,11 +1,15 @@
--# openmp.m4 serial 4
--dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
-+# openmp.m4 serial 7
-+dnl Copyright (C) 2006-2009 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-
- dnl This file can be removed once we assume autoconf >= 2.62.
-
-+dnl Expand to nothing in autoconf >= 2.62. m4_copy has a different
-+dnl semantic in autoconf > 2.63.
-+m4_ifdef([AC_OPENMP], [], [
-+
- # _AC_LANG_OPENMP
- # ---------------
- # Expands to some language dependent source code for testing the presence of
-@@ -90,3 +94,5 @@
- fi
- AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
- ])
-+
-+])
+++ /dev/null
-diff -Nru gettext-0.12.orig/gettext-tools/doc/Makefile.am gettext-0.12/gettext-tools/doc/Makefile.am
---- gettext-0.12.orig/gettext-tools/doc/Makefile.am 2003-04-14 15:39:49.000000000 +0200
-+++ gettext-0.12/gettext-tools/doc/Makefile.am 2003-05-20 14:51:18.000000000 +0200
-@@ -17,19 +17,10 @@
-
- ## Process this file with automake to produce Makefile.in.
-
--docdir = $(datadir)/doc/gettext
--dvidir = $(docdir)
--psdir = $(docdir)
--pdfdir = $(docdir)
--htmldir = $(docdir)
--
- AUTOMAKE_OPTIONS = 1.2 gnits
- EXTRA_DIST =
- MOSTLYCLEANFILES =
-
--SED = sed
--RM = rm -f
--
- MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
-
- info_TEXINFOS = gettext.texi
-@@ -55,150 +46,6 @@
- mv iso-3166.tmp $(srcdir)/iso-3166.texi
-
-
--# We distribute only the split HTML documentation.
--# The user can generate the others, via
--# make gettext.ps
--# make gettext.pdf
--# make gettext.html
--
--all-local: html
--install-data-local: install-html
--installdirs-local: installdirs-html
--uninstall-local: uninstall-html
--# Hidden from automake, but really activated. Works around an automake-1.5 bug.
--#distdir: dist-html
--
--html: html-split
--install-html: install-html-split
--uninstall-html: uninstall-html-split
--dist-html: dist-html-split
--
--CLEANFILES = gettext.pdf gettext.html
--# gettext.dvi and gettext.ps are already known to automake.
--MAINTAINERCLEANFILES = gettext_*.html
--
--
--# Documentation in DVI format.
--
--install-dvi: gettext.dvi
-- $(mkinstalldirs) $(DESTDIR)$(dvidir)
-- $(INSTALL_DATA) `if test -f gettext.dvi; then echo .; else echo $(srcdir); fi`/gettext.dvi $(DESTDIR)$(dvidir)/gettext.dvi
--
--installdirs-dvi:
-- $(mkinstalldirs) $(DESTDIR)$(dvidir)
--
--uninstall-dvi:
-- $(RM) $(DESTDIR)$(dvidir)/gettext.dvi
--
--# Temporary index files. automake removes only the predefined ones by itself.
--MOSTLYCLEANFILES += \
-- gettext.am gettext.ams \
-- gettext.cp gettext.cps \
-- gettext.ef gettext.efs \
-- gettext.em gettext.ems \
-- gettext.ev gettext.evs \
-- gettext.fn gettext.fns \
-- gettext.kw gettext.kws \
-- gettext.op gettext.ops \
-- gettext.pg gettext.pgs \
-- gettext.vr gettext.vrs
--
--
--# Documentation in Postscript format.
--
--DVIPS = @DVIPS@ -D600
--
--ps: gettext.ps
--
--gettext.ps: gettext.dvi
-- $(DVIPS) -o $@ `if test -f gettext.dvi; then echo gettext.dvi; else echo $(srcdir)/gettext.dvi; fi`
--
--install-ps: gettext.ps
-- $(mkinstalldirs) $(DESTDIR)$(psdir)
-- $(INSTALL_DATA) `if test -f gettext.ps; then echo .; else echo $(srcdir); fi`/gettext.ps $(DESTDIR)$(psdir)/gettext.ps
--
--installdirs-ps:
-- $(mkinstalldirs) $(DESTDIR)$(psdir)
--
--uninstall-ps:
-- $(RM) $(DESTDIR)$(psdir)/gettext.ps
--
--
--# Documentation in Portable Document Format.
--
--TEXI2PDF = @TEXI2PDF@
--SUFFIXES = .pdf
--
--pdf: gettext.pdf
--
--.texi.pdf:
-- TEXINPUTS=.:$$TEXINPUTS \
-- MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2PDF) $<
--
--install-pdf: gettext.pdf
-- $(mkinstalldirs) $(DESTDIR)$(pdfdir)
-- $(INSTALL_DATA) `if test -f gettext.pdf; then echo .; else echo $(srcdir); fi`/gettext.pdf $(DESTDIR)$(pdfdir)/gettext.pdf
--
--installdirs-pdf:
-- $(mkinstalldirs) $(DESTDIR)$(pdfdir)
--
--uninstall-pdf:
-- $(RM) $(DESTDIR)$(pdfdir)/gettext.pdf
--
--
--# Documentation in HTML format.
--
--TEXI2HTML = @PERL@ $(srcdir)/texi2html
--
--html-monolithic: gettext.html
--html-split: gettext_toc.html
--
--gettext.html: gettext.texi version.texi $(gettext_TEXINFOS)
-- $(TEXI2HTML) -expandinfo -number -monolithic `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi`
--
--gettext_toc.html: gettext.texi version.texi $(gettext_TEXINFOS)
-- case "@PERL@" in \
-- *"/missing perl") \
-- $(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` || exit 0 ;; \
-- *) $(RM) gettext_*.html ; \
-- $(TEXI2HTML) -expandinfo -number -split_chapter `if test -f gettext.texi; then echo gettext.texi; else echo $(srcdir)/gettext.texi; fi` ;; \
-- esac
--
--install-html-monolithic: gettext.html
-- $(mkinstalldirs) $(DESTDIR)$(htmldir)
-- $(INSTALL_DATA) `if test -f gettext.html; then echo .; else echo $(srcdir); fi`/gettext.html $(DESTDIR)$(htmldir)/gettext.html
--
--install-html-split: gettext_toc.html
-- $(mkinstalldirs) $(DESTDIR)$(htmldir)
-- for file in `if test -f gettext_toc.html; then echo .; else echo $(srcdir); fi`/gettext_*.html; do \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/`basename $$file`; \
-- done
--
--installdirs-html:
-- $(mkinstalldirs) $(DESTDIR)$(htmldir)
--
--uninstall-html-monolithic:
-- $(RM) $(DESTDIR)$(htmldir)/gettext.html
--
--uninstall-html-split:
-- $(RM) $(DESTDIR)$(htmldir)/gettext_*.html
--
--dist-html-monolithic:
-- $(mkinstalldirs) $(distdir)/
-- file=gettext.html; \
-- if test -f $$file; then d=.; else d=$(srcdir); fi; \
-- cp -p $$d/$$file $(distdir)/$$file || exit 1
--
--# We would like to put gettext_*.html into EXTRA_DIST, but it doesn't work.
--dist-html-split:
-- $(mkinstalldirs) $(distdir)/
-- file=gettext_toc.html; \
-- if test -f $$file; then d=.; else d=$(srcdir); fi; \
-- for file in `cd $$d && echo gettext_*.html`; do \
-- cp -p $$d/$$file $(distdir)/$$file || exit 1; \
-- done
--
--
- # VMS support.
-
- EXTRA_DIST += Makefile.vms
+++ /dev/null
-diff -ur gettext-0.17.old/gettext-runtime/libasprintf/configure.ac gettext-0.17/gettext-runtime/libasprintf/configure.ac
---- gettext-0.17.old/gettext-runtime/libasprintf/configure.ac 2007-11-10 19:00:24.000000000 +0100
-+++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2007-11-10 19:01:22.000000000 +0100
-@@ -54,8 +54,8 @@
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE
- AC_TYPE_SIZE_T
--gl_AC_TYPE_LONG_LONG
--gt_TYPE_LONGDOUBLE
-+AC_TYPE_LONG_LONG_INT
-+AC_TYPE_LONG_DOUBLE
- gt_TYPE_WCHAR_T
- gt_TYPE_WINT_T
- AC_CHECK_TYPE([ptrdiff_t], ,
#
# Conditional build:
%bcond_without asprintf # without libasprintf C++ library
-%bcond_with xemacs # without po-mode for xemacs
+%bcond_with xemacs # without po-mode for xemacs
%bcond_without gcj # with Java support by gcj (preferred over javac)
-%bcond_with javac # with Java support by some javac
+%bcond_with javac # with Java support by some javac
%bcond_without dotnet # without .NET support
%bcond_with bootstrap # use system GLib and libcroco
Summary(tr.UTF-8): Desteği için kitaplık ve araçlar
Summary(uk.UTF-8): Бібліотеки та утиліти для підтримки національних мов
Name: gettext
-Version: 0.17
-Release: 10
+Version: 0.18
+Release: 0.1
License: LGPL v2+ (libintl), GPL v3+ (tools)
Group: Development/Tools
Source0: http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
-# Source0-md5: 58a2bc6d39c0ba57823034d55d65d606
+# Source0-md5: d52a3e061032a1ed13856d42fc86f0fd
Patch0: %{name}-info.patch
Patch1: %{name}-killkillkill.patch
Patch2: %{name}-pl.po-update.patch
-Patch3: %{name}-no_docs.patch
+Patch3: %{name}-pl.po-fixes.patch
Patch4: %{name}-libintl_by_gcj.patch
-Patch5: %{name}-removed_macros.patch
-Patch6: %{name}-creat_mode.patch
-Patch7: %{name}-cvs.patch
-Patch8: %{name}-m4.patch
URL: http://www.gnu.org/software/gettext/
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.10
-BuildRequires: cvs-gnu-client
+BuildRequires: autoconf >= 2.62
+BuildRequires: automake >= 1:1.11
+BuildRequires: cvs
%{?with_gcj:BuildRequires: gcj >= 3.0}
%{!?with_bootstrap:BuildRequires: glib2-devel >= 2.0}
%if %{with javac}
%{?with_asprintf:BuildRequires: libstdc++-devel}
BuildRequires: libtool >= 1:1.4.2-9
%{?with_dotnet:BuildRequires: mono-csharp}
+# rlog needed to generate archive.dir.tar.gz properly
+BuildRequires: rcs
BuildRequires: rpmbuild(macros) >= 1.453
BuildRequires: texinfo
%{?with_xemacs:BuildRequires: xemacs}
%setup -q
%patch0 -p1
%patch1 -p1
+for d in gettext-runtime gettext-tools gettext-tools/examples ; do
+ iconv -f iso-8859-2 -t utf-8 ${d}/po/pl.po > ${d}/po/pl.po.utf-8
+ mv -f ${d}/po/pl.po.utf-8 ${d}/po/pl.po
+done
%patch2 -p1
-# patch not finished yet
-#%patch3 -p1
+%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
-# make autopoint to use tar.gz archives instead of cvs repository
-install -d archive-cvs/{prepare,archive}
-tar xzf gettext-tools/misc/archive.tar.gz -C archive-cvs/prepare
-cvs -d$(pwd)/archive-cvs/prepare/archive init
-cd archive-cvs/archive
-cvs -Q -d$(pwd)/../prepare/archive -q co .
-for rev in $(cvs status -v | grep '(revision:' | awk ' { print $1 } ' | sort -u); do
- cvs -Q up -d -r $rev
- cd ..
- tar czf archive-${rev}.tar.gz archive --exclude=CVS
- cd archive
-done
-cd ../..
+## make autopoint to use tar.gz archives instead of cvs repository
+#install -d archive-cvs/{prepare,archive}
+#tar xzf gettext-tools/misc/archive.tar.gz -C archive-cvs/prepare
+#cvs -d$(pwd)/archive-cvs/prepare/archive init
+#cd archive-cvs/archive
+#cvs -Q -d$(pwd)/../prepare/archive -q co .
+#for rev in $(cvs status -v | grep '(revision:' | awk ' { print $1 } ' | sort -u); do
+# cvs -Q up -d -r $rev
+# cd ..
+# tar czf archive-${rev}.tar.gz archive --exclude=CVS
+# cd archive
+#done
+#cd ../..
%{__libtoolize}
-cd autoconf-lib-link
-%{__aclocal} -I m4 -I ../m4
-%{__autoconf}
-%{__automake}
-cd ../gettext-runtime
+cd gettext-runtime
%{__libtoolize}
-%{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
+%{__aclocal} -I m4 -I ../m4 -I gnulib-m4
%{__autoconf}
%{__autoheader}
%{__automake}
cd libasprintf
-%{__aclocal} -I ../m4 -I ../../m4
+%{__aclocal} -I ../../m4 -I ../m4 -I gnulib-m4
%{__autoconf}
%{__autoheader}
%{__automake}
cd ../../gettext-tools
-%{__aclocal} -I m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 -I ../autoconf-lib-link/m4 -I ../gettext-runtime/m4 -I ../m4
+%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
%{__autoconf}
%{__autoheader}
%{__automake}
cd ..
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__automake}
%configure \
--enable-nls \
%{!?with_dotnet:--disable-csharp} \
%{?with_dotnet:--enable-csharp=mono} \
+ --without-cvs \
--without-included-gettext \
%{?with_bootstrap:--with-included-glib} \
%{?with_bootstrap:--with-included-libcroco}
install gettext-tools/gnulib-lib/.libs/libgettextlib.a \
gettext-tools/src/.libs/libgettextsrc.a $RPM_BUILD_ROOT%{_libdir}
-install archive-cvs/archive-*.tar.gz $RPM_BUILD_ROOT%{_datadir}/gettext
-rm $RPM_BUILD_ROOT%{_datadir}/gettext/archive.tar.gz
+#install archive-cvs/archive-*.tar.gz $RPM_BUILD_ROOT%{_datadir}/gettext
+#rm $RPM_BUILD_ROOT%{_datadir}/gettext/archive.tar.gz
rm -r $RPM_BUILD_ROOT%{_docdir}/gettext
rm -r $RPM_BUILD_ROOT%{_docdir}/libasprintf
%post -n libasprintf -p /sbin/ldconfig
%postun -n libasprintf -p /sbin/ldconfig
-%post -n libasprintf-devel -p /sbin/postshell
+%post -n libasprintf-devel -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
-%postun -n libasprintf-devel -p /sbin/postshell
+%postun -n libasprintf-devel -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
%files -f %{name}-runtime.lang
%defattr(644,root,root,755)
-%attr(755,root,root) /bin/*
+%attr(755,root,root) /bin/gettext
+%attr(755,root,root) /bin/ngettext
%attr(755,root,root) %{_bindir}/envsubst
%{_mandir}/man1/envsubst.1*
%{_mandir}/man1/gettext.1*
%files devel -f %{name}-tools.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README THANKS
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/autopoint
-%exclude %{_bindir}/envsubst
+%attr(755,root,root) %{_bindir}/gettext.sh
+%attr(755,root,root) %{_bindir}/gettextize
+%attr(755,root,root) %{_bindir}/msg*
+%attr(755,root,root) %{_bindir}/recode-sr-latin
+%attr(755,root,root) %{_bindir}/xgettext
%attr(755,root,root) %{_libdir}/libgettext*.so
%{_libdir}/libgettext*.la
# libgettextpo is for other programs, not used by gettext tools themselves
%attr(755,root,root) %{_libdir}/gettext/urlget
%attr(755,root,root) %{_libdir}/gettext/user-email
%{_includedir}/gettext-po.h
-%{_aclocaldir}/*
+%{_aclocaldir}/*.m4
%{_infodir}/gettext*.info*
%{_mandir}/man1/gettextize.1*
%{_mandir}/man1/msg*.1*
%files autopoint
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/autopoint
-%{_datadir}/gettext/archive*.tar.gz
+%{_datadir}/gettext/archive.dir.tar.gz
%{_mandir}/man1/autopoint.1*
%if %{with dotnet}
projects / packages / gettext.git / commitdiff