packages: gettext/gettext-info.patch, gettext/gettext-libintl_by_gcj.patch, ...
qboosh
qboosh at pld-linux.org
Sun May 16 15:27:32 CEST 2010
Author: qboosh Date: Sun May 16 13:27:32 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.18
- updated info, libintl_by_gcj, pl.po-update/pl.po-fixes patches
- removed obsolete removed_macros,creat_mode,cvs,m4 patches
- dropped no_docs patch (nobody cared)
- BR: rcs (needed to generate archive.dir.tar.gz properly)
- release 0.1 for testing
---- Files affected:
packages/gettext:
gettext-info.patch (1.9 -> 1.10) , gettext-libintl_by_gcj.patch (1.1 -> 1.2) , gettext.spec (1.170 -> 1.171) , gettext-creat_mode.patch (1.1 -> NONE) (REMOVED), gettext-cvs.patch (1.2 -> NONE) (REMOVED), gettext-m4.patch (1.1 -> NONE) (REMOVED), gettext-no_docs.patch (1.2 -> NONE) (REMOVED), gettext-removed_macros.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/gettext/gettext-info.patch
diff -u packages/gettext/gettext-info.patch:1.9 packages/gettext/gettext-info.patch:1.10
--- packages/gettext/gettext-info.patch:1.9 Wed Nov 7 22:25:57 2007
+++ packages/gettext/gettext-info.patch Sun May 16 15:27:26 2010
@@ -1,5 +1,5 @@
---- 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
@@ -54,7 +54,7 @@
@end direntry
@end ifinfo
-@@ -216,16 +216,16 @@
+@@ -214,16 +214,16 @@
Making the PO Template File
@@ -74,7 +74,7 @@
Editing PO Files
-@@ -257,16 +257,16 @@
+@@ -255,16 +255,16 @@
Manipulating PO Files
@@ -101,7 +101,7 @@
* 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
@@ -112,7 +112,7 @@
* 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
@@ -121,7 +121,7 @@
* 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
@@ -130,7 +130,7 @@
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
@@ -145,7 +145,7 @@
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.
@@ -154,7 +154,7 @@
@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
@@ -163,7 +163,7 @@
@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
@@ -174,16 +174,16 @@
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.
- at xref{msgfmt Invocation}, @ref{c-format Flag} and @ref{c-format}.
+ at xref{msgfmt}, @ref{c-format Flag} and @ref{c-format}.
@item objc-format
@kwindex objc-format at 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
@@ -192,7 +192,7 @@
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
@@ -201,7 +201,7 @@
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
@@ -211,7 +211,7 @@
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
@@ -224,7 +224,7 @@
@section Invoking the @code{xgettext} Program
@include xgettext.texi
-@@ -2845,16 +2844,16 @@
+@@ -2892,16 +2891,16 @@
the header entry of this file.
@menu
@@ -244,7 +244,7 @@
@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
@@ -257,7 +257,7 @@
@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
@@ -350,7 +350,7 @@
@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
@@ -378,7 +378,7 @@
@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
@@ -387,7 +387,7 @@
* 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.
@@ -396,7 +396,7 @@
@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.
@@ -411,7 +411,7 @@
@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
@@ -420,7 +420,7 @@
@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}.
@@ -429,7 +429,7 @@
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
@@ -438,7 +438,7 @@
@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
@@ -447,7 +447,7 @@
@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.
@@ -456,7 +456,7 @@
@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
@@ -471,7 +471,7 @@
@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
@@ -482,7 +482,7 @@
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
@@ -499,12 +499,18 @@
@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.
- at node ngettext Invocation, envsubst Invocation, gettext Invocation, sh
+ at 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.
- at node envsubst Invocation, eval_gettext Invocation, ngettext Invocation, sh
+ at node envsubst, eval_gettext, ngettext, sh
@@ -517,7 +523,7 @@
@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.
================================================================
Index: packages/gettext/gettext-libintl_by_gcj.patch
diff -u packages/gettext/gettext-libintl_by_gcj.patch:1.1 packages/gettext/gettext-libintl_by_gcj.patch:1.2
--- packages/gettext/gettext-libintl_by_gcj.patch:1.1 Sun Jan 7 17:49:57 2007
+++ packages/gettext/gettext-libintl_by_gcj.patch Sun May 16 15:27:26 2010
@@ -1,11 +1,11 @@
---- 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
================================================================
Index: packages/gettext/gettext.spec
diff -u packages/gettext/gettext.spec:1.170 packages/gettext/gettext.spec:1.171
--- packages/gettext/gettext.spec:1.170 Mon Apr 26 09:46:01 2010
+++ packages/gettext/gettext.spec Sun May 16 15:27:26 2010
@@ -10,9 +10,9 @@
#
# 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
@@ -38,25 +38,21 @@
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}
@@ -70,6 +66,8 @@
%{?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}
@@ -317,53 +315,48 @@
%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 \
@@ -371,6 +364,7 @@
--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}
@@ -401,8 +395,8 @@
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
@@ -425,15 +419,16 @@
%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*
@@ -444,9 +439,11 @@
%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
@@ -458,7 +455,7 @@
%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*
@@ -537,7 +534,7 @@
%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}
@@ -554,6 +551,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.171 2010/05/16 13:27:26 qboosh
+- updated to 0.18
+- updated info, libintl_by_gcj, pl.po-update/pl.po-fixes patches
+- removed obsolete removed_macros,creat_mode,cvs,m4 patches
+- dropped no_docs patch (nobody cared)
+- BR: rcs (needed to generate archive.dir.tar.gz properly)
+- release 0.1 for testing
+
Revision 1.170 2010/04/26 07:46:01 arekm
- release 10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gettext/gettext-info.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gettext/gettext-libintl_by_gcj.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gettext/gettext.spec?r1=1.170&r2=1.171&f=u
More information about the pld-cvs-commit
mailing list