Hello community,
here is the log from the commit of package gettext
checked in at Wed Aug 15 16:09:50 CEST 2007.
--------
--- gettext/gettext.changes 2007-05-26 00:01:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/gettext/gettext.changes 2007-08-12 00:19:14.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Aug 9 18:04:26 CEST 2007 - bk@suse.de
+
+- apply the fixes from gettext-0.16.1, noticeable changes:
+ * gettext.m4: changequote instead of pairs of brackets
+ * add a few function protoypes and update polish translations
+- extract missing ycp comments (fix from upstream maintainer, #287150)
+- re-enable make check to identify possible toolchain bugs
+- move java and csharp documentation to gettext-{java,csharp}
+- hardlink duplicate example files in documentation
+
+-------------------------------------------------------------------
--- gettext/gettext-java.changes 2007-04-25 12:52:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/gettext/gettext-java.changes 2007-08-12 00:15:41.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 9 18:04:26 CEST 2007 - bk@suse.de
+
+- re-enable make check to identify possible toolchain bugs
+- move java documentation from gettext to this package
+- hardlink duplicate example files in documentation
+
+-------------------------------------------------------------------
Old:
----
autogen.sh
New:
----
bug287150-ycp-comments.diff
fixes-from-gettext-0.16.1.diff
gettext-linkdupes.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gettext-java.spec ++++++
--- /var/tmp/diff_new_pack.g31355/_old 2007-08-15 16:09:27.000000000 +0200
+++ /var/tmp/diff_new_pack.g31355/_new 2007-08-15 16:09:27.000000000 +0200
@@ -11,19 +11,19 @@
# norootforbuild
Name: gettext-java
-BuildRequires: gcc-c++ gcc-java
+BuildRequires: fdupes gcc-c++ gcc-java
URL: http://www.gnu.org/software/gettext/
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: LGPL v2 or later
Group: Development/Tools/Other
Autoreqprov: on
Version: 0.16
-Release: 29
-Summary: Java support for Native Language Support (NLS)
+Release: 54
+Summary: Java Support for Native Language Support (NLS)
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gettext-%{version}.tar.bz2
Source2: suse-start-po-mode.el
-Source3: autogen.sh
+Source3: gettext-linkdupes.sh
Patch: gettext-0.12.1-sigfpe.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch3: gettext-codecleanup.patch
@@ -32,6 +32,7 @@
Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch
Patch8: gettext-expat_check.patch
+Patch9: fixes-from-gettext-0.16.1.diff
%description
This package includes the tools needed to support message catalogs in
@@ -55,47 +56,78 @@
%patch6 -p1
%patch7
%patch8
-cp %{SOURCE3} .
+%patch9 -p1
rename no nb gettext-tools/po/no.*
rename no nb gettext-runtime/po/no.*
-
-%build
-#sh autogen.sh
-aclocal --force
-autoreconf -fi
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
tar cfz archive.tar.gz archive/
popd
-# [ -f /usr/bin/emacs ] || ln -sf emacs-nox /usr/bin/emacs
-rm -f config/m4/libtool.m4
-autoreconf -fi
+autoreconf -fiv
+
+%build
export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall"
export CXXFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall"
-./configure --prefix=/usr \
- --enable-shared \
- --infodir=%{_infodir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --build=%{_target_cpu}-suse-linux
-make GMSGFMT=../src/msgfmt DESTDIR=$RPM_BUILD_ROOT
-# use texinfo.tex supplied by the system (texinfo)
-# make -C gettext-tools/doc gettext.pdf
-#make check
+%configure --enable-shared
+make GMSGFMT=../src/msgfmt
%install
-rm -rf $RPM_BUILD_ROOT
export LC_CTYPE=ISO-8859-15
make -C gettext-tools/src install DESTDIR=$RPM_BUILD_ROOT
+make -C gettext-runtime/intl-java install DESTDIR=$PWD docdir=/docs
+make -C gettext-tools/examples install DESTDIR=$PWD docdir=/allexamples
+mkdir -p docs/examples
+mv allexamples/examples/*java* docs/examples
+cd docs/examples
+fdupes -r *|while read dupe; do
+ if [ -z "$dupe" ]; then
+ startlink=
+ elif [ -z "$startlink" ]; then
+ startlink="$dupe"
+ else
+ ln -f "$startlink" "$dupe"
+ fi
+done
+cd ..
+find -size 0 -print0 | xargs -0 --no-run-if-empty rm
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/*
+mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}
+cp -av * $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}
+cd ../allexamples/examples
+rm -rf *csharp*
+fdupes -r * | while read dupe; do
+ if [ -z "$dupe" ]; then
+ startlink=
+ elif [ -z "$startlink" ]; then
+ startlink="$dupe"
+ else
+ echo "ln -f '$startlink' '$dupe'" >>../../gettext-linkdupes.sh
+ fi
+done
+
+%check
+%if %{?__debug_package:1}0
+make check
+%endif
+diff %{SOURCE3} . || {
+ cat <http://www.gnu.org/software/gettext/
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: LGPL v2 or later
Group: Development/Tools/Other
Autoreqprov: on
Version: 0.16
-Release: 23
+Release: 37
Summary: Tools for Native Language Support (NLS)
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gettext-%{version}.tar.bz2
Source2: suse-start-po-mode.el
-Source3: autogen.sh
+Source3: gettext-linkdupes.sh
Patch: gettext-0.12.1-sigfpe.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch3: gettext-codecleanup.patch
@@ -32,11 +34,13 @@
Patch6: gettext-0.15-docdir.diff
Patch7: gettext-autotools.patch
Patch8: gettext-expat_check.patch
+Patch9: bug287150-ycp-comments.diff
+Patch10: fixes-from-gettext-0.16.1.diff
%description
This package contains the intl library as well as tools that ease the
-creation and maintenance of message catalogs. With it, you can extract
-strings from source code. The supplied Emacs mode (po-mode.el) aids in
+creation and maintenance of message catalogs. It allows you to extract
+strings from source code. The supplied Emacs mode (po-mode.el) helps
editing these catalogs (called PO files, for portable object) and
adding translations. A special compiler turns these PO files into
binary catalogs.
@@ -79,41 +83,29 @@
%patch6 -p1
%patch7
%patch8
-cp %{SOURCE3} .
+%patch9 -p1
+%patch10 -p1
rename no nb gettext-tools/po/no.*
rename no nb gettext-runtime/po/no.*
-
-%build
-#sh autogen.sh
-aclocal --force
-aclocal --force
-autoreconf -fi
-autoreconf -fi
pushd gettext-tools/misc
tar xfz archive.tar.gz
find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/\(int\) /\(long\) /g'
tar cfz archive.tar.gz archive/
popd
-# [ -f /usr/bin/emacs ] || ln -sf emacs-nox /usr/bin/emacs
-rm -f config/m4/libtool.m4
-autoreconf -fi
-autoreconf -fi
+# expect a couple "You should update your `aclocal.m4' by running aclocal."
+autoreconf -fiv
+
+%build
+#sh autogen.sh
export CFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall"
-export CXXFLAGS="$RPM_OPT_FLAGS -pipe -W -Wall"
-./configure --prefix=/usr \
- --enable-shared \
- --infodir=%{_infodir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --build=%{_target_cpu}-suse-linux
-make GMSGFMT=../src/msgfmt DESTDIR=$RPM_BUILD_ROOT
+export CXXFLAGS="$CFLAGS"
+%configure --enable-shared
+make GMSGFMT=../src/msgfmt
# use texinfo.tex supplied by the system (texinfo)
# make -C gettext-tools/doc gettext.pdf
-#make check
%install
%define my_docdir %{_defaultdocdir}/%{name}
-rm -rf $RPM_BUILD_ROOT
export LC_CTYPE=ISO-8859-15
make install DESTDIR=$RPM_BUILD_ROOT docdir=%{my_docdir}
cp -pr AUTHORS COPYING NEWS README* $RPM_BUILD_ROOT/%{my_docdir}
@@ -126,12 +118,37 @@
if [ -e $RPM_BUILD_ROOT/%{_libdir}/preloadable_libintl.so ];then
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/preloadable_libintl.so
fi
+# fix rpmlint invalid-lc-messages-dir:
+rm -rf $RPM_BUILD_ROOT/%_datadir/locale/en@{bold,}quot
%{find_lang} gettext-tools
%{find_lang} gettext-runtime
#remove unwanted stuff
rm -f $RPM_BUILD_ROOT/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
#find $RPM_BUILD_ROOT -maxdepth 2 -name '*html' | xargs rm -f
-#rm -fr $RPM_BUILD_ROOT/javadoc*
+# hardlink the dupes in the documentation:
+cd $RPM_BUILD_ROOT/%{my_docdir}/examples
+sh %{SOURCE3}
+# moved to gettext-java and gettext-charp:
+rm -rf *csharp* *java* ../javadoc* ../csharpdoc*
+
+%check
+# s390s fails this test,
+# Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed.
+%if %{?__debug_package:1}0
+make check || {
+%ifarch s390x
+ echo "got this during mbuild testing on s390x (on both times which make check ran):"
+ echo "Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion mutex->__data.__owner == 0 failed."
+ echo "s390x needs kernel/glibc/gcc fix, but let it continue bootstrap for now!"
+%else
+ echo "make check failed, check it!"
+ exit 5
+%endif
+}
+%endif
+cd $RPM_BUILD_ROOT/%{_mandir}/man3
+ln -f dngettext.3.gz dcngettext.3.gz
+ln -f dgettext.3.gz dcgettext.3.gz
%clean
rm -rf $RPM_BUILD_ROOT
@@ -154,7 +171,6 @@
%defattr(-,root,root)
%dir %_prefix/share/gettext
%doc %dir %_defaultdocdir/%name
-%doc %_defaultdocdir/%name/javadoc*
%doc %_defaultdocdir/%name/gettext.1.html
%doc %_defaultdocdir/%name/ngettext.1.html
%doc %_defaultdocdir/%name/envsubst.1.html
@@ -178,7 +194,6 @@
%doc %_mandir/man3/*
%_prefix/share/gettext/ABOUT-NLS
%_libdir/libasprintf.so.*
-%_includedir/autosprintf.h
%dir %_prefix/share/emacs
%dir %_prefix/share/emacs/site-lisp
%_prefix/share/emacs/site-lisp/po-compat.*
@@ -189,7 +204,6 @@
%files devel -f gettext-tools.lang
%defattr(-,root,root)
%doc %_defaultdocdir/%name/examples
-%doc %_defaultdocdir/%name/csharpdoc
%doc %_defaultdocdir/%name/auto*.html
%doc %_defaultdocdir/%name/gettext_*.html
%doc %_defaultdocdir/%name/gettextize*.html
@@ -210,6 +224,7 @@
%doc %_infodir/gettext.info*
%doc %_infodir/autosprintf.info*
%_includedir/gettext-po.h
+%_includedir/autosprintf.h
%_libdir/libasprintf.*a
%_libdir/libasprintf.so
%_libdir/libgettextlib.*
@@ -228,6 +243,14 @@
%_prefix/share/aclocal/*
%changelog
+* Thu Aug 09 2007 - bk@suse.de
+- apply the fixes from gettext-0.16.1, noticeable changes:
+ * gettext.m4: changequote instead of pairs of brackets
+ * add a few function protoypes and update polish translations
+- extract missing ycp comments (fix from upstream maintainer, #287150)
+- re-enable make check to identify possible toolchain bugs
+- move java and csharp documentation to gettext-{java,csharp}
+- hardlink duplicate example files in documentation
* Sat May 26 2007 - ro@suse.de
- added rpmlintrc for gettext-devel (examples executable)
* Fri Apr 20 2007 - pth@suse.de
++++++ bug287150-ycp-comments.diff ++++++
--- gettext-0.16.1/gettext-tools/src/x-ycp.c 2006-11-27 18:02:08.000000000 +0100
+++ gettext-CVS/gettext-tools/src/x-ycp.c 2007-06-25 11:14:49.000000000 +0200
@@ -1,5 +1,5 @@
/* xgettext YCP backend.
- Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
This file was written by Bruno Haible , 2001.
@@ -21,6 +21,9 @@
# include "config.h"
#endif
+/* Specification. */
+#include "x-ycp.h"
+
#include
#include
#include
@@ -32,7 +35,6 @@
#include "x-ycp.h"
#include "error.h"
#include "xalloc.h"
-#include "exit.h"
#include "gettext.h"
#define _(s) gettext(s)
@@ -327,6 +329,7 @@
{
token_type_ty type;
char *string; /* for token_type_string_literal, token_type_symbol */
+ refcounted_string_list_ty *comment; /* for token_type_string_literal */
int line_number;
};
@@ -403,6 +406,17 @@
}
+/* Free the memory pointed to by a 'struct token_ty'. */
+static inline void
+free_token (token_ty *tp)
+{
+ if (tp->type == token_type_string_literal || tp->type == token_type_symbol)
+ free (tp->string);
+ if (tp->type == token_type_string_literal)
+ drop_reference (tp->comment);
+}
+
+
/* Combine characters into tokens. Discard whitespace. */
static token_ty phase5_pushback[1];
@@ -530,6 +544,7 @@
buffer[bufpos] = '\0';
tp->string = xstrdup (buffer);
tp->type = token_type_string_literal;
+ tp->comment = add_reference (savable_comment);
return;
case '(':
@@ -590,7 +605,7 @@
len = strlen (tp->string);
tp->string = xrealloc (tp->string, len + strlen (tmp.string) + 1);
strcpy (tp->string + len, tmp.string);
- free (tmp.string);
+ free_token (&tmp);
}
}
@@ -670,7 +685,7 @@
/* Seen an msgid. */
plural_mp = remember_a_message (mlp, NULL, token.string,
inner_context, &pos,
- savable_comment);
+ token.comment);
state = 2;
}
else
@@ -678,13 +693,14 @@
/* Seen an msgid_plural. */
remember_a_message_plural (plural_mp, token.string,
inner_context, &pos,
- savable_comment);
+ token.comment);
state = 0;
}
+ drop_reference (token.comment);
}
else
{
- free (token.string);
+ free_token (&token);
state = 0;
}
next_context_iter = null_context_list_iterator;
@@ -696,7 +712,7 @@
flag_context_list_table_lookup (
flag_context_list_table,
token.string, strlen (token.string)));
- free (token.string);
+ free_token (&token);
state = 0;
continue;
--- gettext-0.16.1/gettext-tools/src/x-ycp.h 2006-11-27 18:02:08.000000000 +0100
+++ gettext-CVS/gettext-tools/src/x-ycp.h 2006-10-30 13:31:40.000000000 +0100
@@ -1,5 +1,5 @@
/* xgettext YCP backend.
- Copyright (C) 2001-2003 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
Written by Bruno Haible , 2001.
This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,17 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+#include
+
+#include "message.h"
+#include "xgettext.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
#define EXTENSIONS_YCP \
{ "ycp", "YCP" }, \
@@ -31,3 +42,8 @@
msgdomain_list_ty *mdlp);
extern void init_flag_table_ycp (void);
+
+
+#ifdef __cplusplus
+}
+#endif
++++++ fixes-from-gettext-0.16.1.diff ++++++
++++ 656 lines (skipped)
++++++ rpmlintrc ++++++
--- gettext/rpmlintrc 2007-05-26 00:01:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/gettext/rpmlintrc 2007-08-10 04:00:11.000000000 +0200
@@ -2,3 +2,9 @@
from Config import *
addFilter("gettext-devel spurious-executable-perm")
+addFilter("gettext-devel postun-without-ldconfig")
+addFilter("gettext-devel postin-without-ldconfig")
+addFilter("gettext shlib-policy-nonversioned-dir")
+addFilter("gettext shlib-policy-missing-suffix")
+addFilter("gettext-csharp package-with-huge-docs")
+addFilter("gettext-java package-with-huge-docs")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org