- Remove the gettext-libs docs, as they are talking about autoconf,

libtool, which are not directly related to the gettext-libs.
- Remove unused definition and trailing space.
- Fix the build failure with mock and koji

gettext-0.17-rpathFix.patch

@@ -1,6 +1,6 @@
-diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix ./gettext-runtime/libasprintf/configure.ac
+diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
---- ./gettext-runtime/libasprintf/configure.ac.rpathFix	2007-10-08 05:37:36.000000000 +1000
+--- ./gettext-runtime/libasprintf/configure.ac.rpathFix~	2007-10-08 05:37:36.000000000 +1000
-+++ ./gettext-runtime/libasprintf/configure.ac	2008-08-06 10:13:05.000000000 +1000
++++ ./gettext-runtime/libasprintf/configure.ac	2008-08-28 16:43:18.000000000 +1000
 @@ -54,7 +54,8 @@ dnl Checks for header files.
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_INLINE
@@ -11,21 +11,52 @@ diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix ./gettext-runtime/l
  gt_TYPE_LONGDOUBLE
  gt_TYPE_WCHAR_T
  gt_TYPE_WINT_T
-diff -up ./gettext-tools/src/Makefile.am.rpathFix ./gettext-tools/src/Makefile.am
+diff -up ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~ ./gettext-tools/gnulib-tests/Makefile.gnulib
-diff -up ./gettext-tools/tests/Makefile.am.rpathFix ./gettext-tools/tests/Makefile.am
+--- ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~	2007-10-28 01:39:18.000000000 +1000
---- ./gettext-tools/tests/Makefile.am.rpathFix	2008-08-06 15:17:43.000000000 +1000
++++ ./gettext-tools/gnulib-tests/Makefile.gnulib	2008-08-28 16:43:18.000000000 +1000
-+++ ./gettext-tools/tests/Makefile.am	2008-08-06 15:35:24.000000000 +1000
+@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I ../gnulib-m4
+ 
+ SUBDIRS =
+ TESTS =
+-TESTS_ENVIRONMENT =
++TESTS_ENVIRONMENT = LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64'
+ noinst_PROGRAMS =
+ check_PROGRAMS =
+ noinst_HEADERS =
+diff -up ./gettext-tools/src/Makefile.am.rpathFix~ ./gettext-tools/src/Makefile.am
+--- ./gettext-tools/src/Makefile.am.rpathFix~	2007-10-08 05:37:38.000000000 +1000
++++ ./gettext-tools/src/Makefile.am	2008-08-28 17:16:45.000000000 +1000
+@@ -62,6 +62,7 @@ projectsdir = $(pkgdatadir)/projects
+ pkglibdir = $(libdir)/gettext
+ 
+ AM_CPPFLAGS = \
++  -I../../../../../../usr/include \
+   -I. -I$(srcdir) \
+   -I.. -I$(top_srcdir) \
+   -I$(top_srcdir)/libgrep \
+@@ -82,7 +83,7 @@ LDADD = ../gnulib-lib/libgettextlib.la @
+ 
+ SED = sed
+ YACC = @YACC@ -d
+-GCJ = @GCJ@
++GCJ = gcj
+ GCJFLAGS = @GCJFLAGS@
+ JAR = @JAR@
+ JAVACOMP = $(SHELL) ../javacomp.sh
+diff -up ./gettext-tools/tests/Makefile.am.rpathFix~ ./gettext-tools/tests/Makefile.am
+--- ./gettext-tools/tests/Makefile.am.rpathFix~	2007-10-21 07:54:40.000000000 +1000
++++ ./gettext-tools/tests/Makefile.am	2008-08-28 16:43:18.000000000 +1000
 @@ -181,6 +181,7 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_src
  		    LOCALE_JA='@LOCALE_JA@' \
  		    host_os='@host_os@' \
  		    CONFIG_SHELL='$(SHELL)' \
-+		    LD_LIBRARY_PATH=../intl/.libs
++		    LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64' \
  		    $(SHELL)
  
  xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
-diff -up ./m4/libtool.m4.rpathFix ./m4/libtool.m4
+diff -up ./m4/libtool.m4.rpathFix~ ./m4/libtool.m4
---- ./m4/libtool.m4.rpathFix	2007-10-27 10:46:10.000000000 +1000
+--- ./m4/libtool.m4.rpathFix~	2007-10-27 10:46:10.000000000 +1000
-+++ ./m4/libtool.m4	2008-08-06 15:30:36.000000000 +1000
++++ ./m4/libtool.m4	2008-08-28 16:43:18.000000000 +1000
 @@ -1616,7 +1616,7 @@ linux* | k*bsd*-gnu)
    # This implies no fast_install, which is unacceptable.
    # Some rework will be needed to allow for fast_install

gettext.spec

@@ -1,14 +1,10 @@
 # libintl.jar requires gcj >= 4.3 to build
 %define buildjar 1
-%define LTV_CURRENT 8
-%define LTV_REVISION 0
-%define LTV_AGE 2
-%define preloadable_libintl_ver %{LTV_CURRENT}.%{LTV_REVISION}.%{LTV_AGE}
 
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -21,6 +17,8 @@ BuildRequires: automake >= 1.8
 %endif
 BuildRequires: autoconf >= 2.5
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
+# For javadoc
+BuildRequires: java-1.6.0-openjdk-devel
 # need expat for xgettext on glade
 Buildrequires: expat-devel
 %if %{buildjar}
@@ -52,7 +50,10 @@ Group: Development/Tools
 License: LGPLv2+
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
-Requires: cvs info
+Requires: cvs
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+
 
 %description devel
 This package contains all development related files necessary for
@@ -75,10 +76,6 @@ This package contains libraries used internationalization support.
 %patch5 -p0 -b .5-open-args~
 %patch6 -p0 -b .6-autopoint~
 %patch7 -p0 -b .rpathFix~
-cp autoconf-lib-link/AUTHORS AUTHORS-autoconf-lib-link
-cp autoconf-lib-link/ChangeLog ChangeLog-autoconf-lib-link
-cp autoconf-lib-link/README README-autoconf-lib-link
-cp gnulib-local/ChangeLog ChangeLog-gnulib-local
 
 
 %build
@@ -90,9 +87,13 @@ export JAR=fastjar
 %endif
 %configure --without-included-gettext --enable-nls --disable-static \
     --enable-shared --with-pic-=yes --disable-csharp --enable-java \
-    --disable-rpath
+    --disable-rpatha
+autoreconf -v
 make %{?_smp_mflags} GCJFLAGS="-findirect-dispatch"
 
+# For generating gettext-tools/src/gnu.gettext.*
+make -C gettext-tools/src gnu.gettext.DumpResource
+
 
 %install
 rm -rf %{buildroot}
@@ -110,8 +111,6 @@ install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
 
 # make preloadable_libintl.so executable
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/preloadable_libintl.so
-#mkdir -p ${RPM_BUILD_ROOT}/%{_libexecdir}
-#mv ${RPM_BUILD_ROOT}%{_libdir}/preloadable_libintl.so ${RPM_BUILD_ROOT}/%{_libexecdir}
 
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
@@ -142,6 +141,8 @@ rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/libintl.jar
 %endif
 
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gettext.jar
+
 # remove unpackaged files from the buildroot
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/emacs
 rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
@@ -157,6 +158,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %check
+## For Koji build problem
+cp  ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/src/.libs
+cp  ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/tests/.libs
+cp  ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/src/.libs
+cp  ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/tests/.libs
+
 make check
 
 
@@ -164,7 +171,7 @@ make check
 %define remove_install_info /sbin/install-info --delete
 
 
-%post 
+%post
 /sbin/ldconfig
 %{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir || :
 
@@ -244,19 +251,22 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
-%doc AUTHORS-autoconf-lib-link ChangeLog-autoconf-lib-link README-autoconf-lib-link
-%doc ChangeLog-gnulib-local
 
 %{_libdir}/libasprintf.so.*
 %{_libdir}/libgettextpo.so.*
 
 
 %changelog
+* Fri Aug 29 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-7
+- Remove the gettext-libs docs, as they are talking about autoconf, libtool, 
+  which are not directly related to the gettext-libs.
+- Remove unused definition and trailing space.
+- Fix the build failure with mock and koji.
+
 * Tue Aug 19 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-6
 - Fixed Bug 456666 msghack doesn't check for mandatory cmd line params 
   by adding checking statements and display usage (msghack.py modified)
 - rpath patch for binary-or-shlib-defines-rpath in x86_64.
-- move the preloadable_libintl.so to {_libexecdir}.
 
 * Thu Apr 24 2008 Jens Petersen <petersen@redhat.com> - 0.17-5
 - fix autopoint messing up CVS files with upstream patch (#441481)

import.log

@@ -1 +1,2 @@
 gettext-0_17-6_fc9:HEAD:gettext-0.17-6.fc9.src.rpm:1219621503
+gettext-0_17-7_fc9:HEAD:gettext-0.17-7.fc9.src.rpm:1219969143