rpms/gettext/devel gettext-0.17-open-args.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 gettext.spec, 1.80, 1.81 sources, 1.15, 1.16 gettext-php-headers.patch, 1.1, NONE gettext-php-prinf-output-237241.patch, 1.1, NONE gettext-tools-tests-lang-gawk-fail.patch, 1.1, NONE gettext-xglade-define-xml-major-version-285701.patch, 1.3, NONE po-mode-init.el, 1.2, NONE

Jens Petersen (petersen) fedora-extras-commits at redhat.com
Thu Jan 24 07:38:07 UTC 2008


Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6103

Modified Files:
	.cvsignore gettext.spec sources 
Added Files:
	gettext-0.17-open-args.patch 
Removed Files:
	gettext-php-headers.patch 
	gettext-php-prinf-output-237241.patch 
	gettext-tools-tests-lang-gawk-fail.patch 
	gettext-xglade-define-xml-major-version-285701.patch 
	po-mode-init.el 
Log Message:
- update to 0.17 release
  - update License field to GPLv3
  - add gettext-0.17-open-args.patch to fix build from upstream
  - gettext-tools-tests-lang-gawk-fail.patch, gettext-php-headers.patch,
    gettext-php-prinf-output-237241.patch, and
    gettext-xglade-define-xml-major-version-285701.patch are no longer needed
- drop superfluous po-mode-init.el source
- no need to run autoconf and autoheader when building
- pass -findirect-dispatch to gcj to make java binaries ABI independent
  (jakub,#427796)
- move autopoint, gettextize, and /usr/share/gettext/ to main package


gettext-0.17-open-args.patch:

--- NEW FILE gettext-0.17-open-args.patch ---
2007-11-07  Jim Meyering  <meyering at redhat.com>
            Bruno Haible  <bruno at clisp.org>

	* write-catalog.c (msgdomain_list_print): Fix open() call.

--- gettext-tools/src/write-catalog.c	7 Oct 2007 19:35:31 -0000	1.4
+++ gettext-tools/src/write-catalog.c	7 Nov 2007 11:43:15 -0000
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -220,7 +220,9 @@
       /* Open the output file.  */
       if (!to_stdout)
 	{
-	  fd = open (filename, O_WRONLY | O_CREAT);
+	  fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC,
+		     /* 0666 in portable POSIX notation: */
+		     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 	  if (fd < 0)
 	    {
 	      const char *errno_description = strerror (errno);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Dec 2006 00:19:41 -0000	1.14
+++ .cvsignore	24 Jan 2008 07:37:30 -0000	1.15
@@ -1 +1 @@
-gettext-0.16.1.tar.gz
+gettext-0.17.tar.gz


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gettext.spec	21 Sep 2007 05:11:02 -0000	1.80
+++ gettext.spec	24 Jan 2008 07:37:30 -0000	1.81
@@ -3,13 +3,12 @@
 
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
-Version: 0.16.1
-Release: 12%{?dist}
-License: GPLv2+ and LGPLv2+
+Version: 0.17
+Release: 1%{?dist}
+License: GPLv3 and LGPLv2+
 Group: Development/Tools
-Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 URL: http://www.gnu.org/software/gettext/
-Source1: po-mode-init.el
+Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -26,10 +25,7 @@
 BuildRequires: zip, unzip
 %endif
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Patch1: gettext-tools-tests-lang-gawk-fail.patch
-Patch2: gettext-php-headers.patch
-Patch3: gettext-php-prinf-output-237241.patch
-Patch4: gettext-xglade-define-xml-major-version-285701.patch
+Patch5: gettext-0.17-open-args.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -72,18 +68,10 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-fails~
-%patch2 -p0 -b .2-header~
-%patch3 -p1 -b .3-printf~
-%patch4 -p1 -b .4-expat~
+%patch5 -p0 -b .5-open-args~
 
 
 %build
-pushd gettext-tools
-autoconf
-autoheader
-popd
-
 [ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
 
 export JAVAC=gcj
@@ -92,7 +80,7 @@
 %endif
 %configure --without-included-gettext --enable-nls --disable-static \
     --enable-shared --with-pic-=yes --disable-csharp --enable-java
-make %{?_smp_mflags}
+make %{?_smp_mflags} GCJFLAGS="-findirect-dispatch"
 
 
 %install
@@ -108,14 +96,11 @@
 
 install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
 
-# make preloadable_libintl.so
+# make preloadable_libintl.so executable
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/preloadable_libintl.so
 
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d
-
 # doc relocations
 for i in gettext-runtime/man/*.html; do
   rm ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/`basename $i`
@@ -133,11 +118,11 @@
 ## note libintl.jar is not actually built now with gcj < 4.3
 ## since it would not be fully portable
 %if %{buildjar}
-## this is probably no longer needed if examples not packaged
-# set timestamp of examples ChangeLog timestamp for brp-java-repack-jars
-for i in `find ${RPM_BUILD_ROOT} examples -newer ChangeLog -type f -name ChangeLog`; do
-  touch -r ChangeLog  $i
-done
+### this is no longer needed since examples not packaged
+## set timestamp of examples ChangeLog timestamp for brp-java-repack-jars
+#for i in `find ${RPM_BUILD_ROOT} examples -newer ChangeLog -type f -name ChangeLog`; do
+#  touch -r ChangeLog  $i
+#done
 %endif
 
 # remove unpackaged files from the buildroot
@@ -199,16 +184,15 @@
 %doc gettext-runtime/intl/COPYING*
 /bin/*
 %{_bindir}/*
-%exclude %{_bindir}/autopoint
-%exclude %{_bindir}/gettextize
 %{_libdir}/libgettextlib-%{version}.so
 %{_libdir}/libgettextsrc-%{version}.so
 %{_infodir}/gettext*
 %{_mandir}/man1/*
-%exclude %{_mandir}/man1/gettextize.1.gz
-%exclude %{_mandir}/man1/autopoint.1.gz
 %{_libdir}/%{name}
 %exclude %{_libdir}/%{name}/gnu.gettext.*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/archive.tar.gz
+%{_datadir}/%{name}/styles
 %if %{buildjar}
 %{_datadir}/%{name}/libintl.jar
 %endif
@@ -217,13 +201,8 @@
 %files devel
 %defattr(-,root,root,-)
 %doc gettext-runtime/man/*.3.html ChangeLog
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/projects
-%{_bindir}/gettextize
-%{_bindir}/autopoint
 %{_datadir}/%{name}/ABOUT-NLS
-%{_datadir}/%{name}/projects/*
-%{_datadir}/%{name}/archive.tar.gz
+%{_datadir}/%{name}/projects/
 %{_datadir}/%{name}/config.rpath
 %{_datadir}/%{name}/*.h
 %{_datadir}/%{name}/intl
@@ -237,8 +216,6 @@
 %{_libdir}/libgettextlib.so
 %{_libdir}/libgettextsrc.so
 %{_libdir}/preloadable_libintl.so
-%{_mandir}/man1/gettextize.1.gz
-%{_mandir}/man1/autopoint.1.gz
 %{_mandir}/man3/*
 %{_datadir}/%{name}/javaversion.class
 %doc gettext-runtime/intl-java/javadoc*
@@ -252,6 +229,19 @@
 
 
 %changelog
+* Thu Jan 24 2008 Jens Petersen <petersen at redhat.com> - 0.17-1
+- update to 0.17 release
+  - update License field to GPLv3
+  - add gettext-0.17-open-args.patch to fix build from upstream
+  - gettext-tools-tests-lang-gawk-fail.patch, gettext-php-headers.patch,
+    gettext-php-prinf-output-237241.patch, and
+    gettext-xglade-define-xml-major-version-285701.patch are no longer needed
+- drop superfluous po-mode-init.el source
+- no need to run autoconf and autoheader when building
+- pass -findirect-dispatch to gcj to make java binaries ABI independent
+  (jakub,#427796)
+- move autopoint, gettextize, and %{_datadir}/%{name}/ to main package
+
 * Fri Sep 21 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-12
 - add a libs subpackage (suggested by Dwayne Bailey, #294891)
 - move preloadable_libintl.so to the devel subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Dec 2006 00:19:41 -0000	1.15
+++ sources	24 Jan 2008 07:37:30 -0000	1.16
@@ -1 +1 @@
-3d9ad24301c6d6b17ec30704a13fe127  gettext-0.16.1.tar.gz
+58a2bc6d39c0ba57823034d55d65d606  gettext-0.17.tar.gz


--- gettext-php-headers.patch DELETED ---


--- gettext-php-prinf-output-237241.patch DELETED ---


--- gettext-tools-tests-lang-gawk-fail.patch DELETED ---


--- gettext-xglade-define-xml-major-version-285701.patch DELETED ---


--- po-mode-init.el DELETED ---




More information about the fedora-extras-commits mailing list