packages: crossmingw32-gettext/crossmingw32-gettext-kill_tools.patch, cross...

qboosh qboosh at pld-linux.org
Sun Jun 20 12:39:29 CEST 2010 

Author: qboosh                       Date: Sun Jun 20 10:39:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.18.1.1
- updated kill-tools patch
- no glib2 or libunistring BR as tools are not built

---- Files affected:
packages/crossmingw32-gettext:
   crossmingw32-gettext-kill_tools.patch (1.1 -> 1.2) , crossmingw32-gettext.spec (1.35 -> 1.36) , gettext-libintl_by_gcj.patch (1.1 -> 1.2) , gettext-info.patch (1.9 -> NONE)  (REMOVED), gettext-removed_macros.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/crossmingw32-gettext/crossmingw32-gettext-kill_tools.patch
diff -u packages/crossmingw32-gettext/crossmingw32-gettext-kill_tools.patch:1.1 packages/crossmingw32-gettext/crossmingw32-gettext-kill_tools.patch:1.2
--- packages/crossmingw32-gettext/crossmingw32-gettext-kill_tools.patch:1.1	Fri Jan 22 02:00:52 2010
+++ packages/crossmingw32-gettext/crossmingw32-gettext-kill_tools.patch	Sun Jun 20 12:39:23 2010
@@ -1,22 +1,22 @@
---- gettext-0.17/configure.ac.org	2010-01-22 01:41:49.350588481 +0100
-+++ gettext-0.17/configure.ac	2010-01-22 01:41:55.122718436 +0100
-@@ -36,7 +36,7 @@
+--- gettext-0.18.1.1/configure.ac.orig	2010-06-06 14:49:57.000000000 +0200
++++ gettext-0.18.1.1/configure.ac	2010-06-20 00:03:32.991443936 +0200
+@@ -37,7 +37,7 @@
  
  dnl Checks for library functions.
  
--AC_CONFIG_SUBDIRS(autoconf-lib-link gettext-runtime gettext-tools)
-+AC_CONFIG_SUBDIRS(autoconf-lib-link gettext-runtime)
+-AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
++AC_CONFIG_SUBDIRS([gettext-runtime])
  
  dnl Ensure that "configure --help" lists all the command line options that
  dnl are usable with the subdir configures. Really AC_CONFIG_SUBDIRS should
---- gettext-0.17/Makefile.am.org	2010-01-22 01:44:52.630962481 +0100
-+++ gettext-0.17/Makefile.am	2010-01-22 01:45:14.619713081 +0100
-@@ -19,7 +19,7 @@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+--- gettext-0.18.1.1/Makefile.am.orig	2010-06-06 14:49:57.000000000 +0200
++++ gettext-0.18.1.1/Makefile.am	2010-06-20 00:03:49.599439746 +0200
+@@ -20,7 +20,7 @@
  ACLOCAL = build-aux/fixaclocal @ACLOCAL@
+ ACLOCAL_AMFLAGS = -I m4
  
--SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link
-+SUBDIRS = gnulib-local gettext-runtime autoconf-lib-link
+-SUBDIRS = gnulib-local gettext-runtime gettext-tools
++SUBDIRS = gnulib-local gettext-runtime
  
  EXTRA_DIST = \
    version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \

================================================================
Index: packages/crossmingw32-gettext/crossmingw32-gettext.spec
diff -u packages/crossmingw32-gettext/crossmingw32-gettext.spec:1.35 packages/crossmingw32-gettext/crossmingw32-gettext.spec:1.36
--- packages/crossmingw32-gettext/crossmingw32-gettext.spec:1.35	Fri Jan 22 02:02:30 2010
+++ packages/crossmingw32-gettext/crossmingw32-gettext.spec	Sun Jun 20 12:39:23 2010
@@ -1,28 +1,21 @@
 # $Revision$, $Date$
-#
-%bcond_with     bootstrap       # use system GLib
-#
 Summary:	gettext libraries - cross mingw32 version
 Summary(pl.UTF-8):	Biblioteki gettext - wersja skrośna dla mingw32
 %define		realname		gettext
 Name:		crossmingw32-%{realname}
-Version:	0.17
+Version:	0.18.1.1
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
 Source0:	http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.gz
-# Source0-md5:	58a2bc6d39c0ba57823034d55d65d606
-Patch0:		%{realname}-info.patch
-Patch1:		%{realname}-libintl_by_gcj.patch
-Patch2:		%{realname}-removed_macros.patch
-Patch3:		%{name}-kill_tools.patch
+# Source0-md5:	3dd55b952826d2b32f51308f2f91aa89
+Patch0:		%{realname}-libintl_by_gcj.patch
+Patch1:		%{name}-kill_tools.patch
 URL:		http://www.gnu.org/software/gettext/
-BuildRequires:	autoconf >= 2.60
-BuildRequires:	automake >= 1:1.10
+BuildRequires:	autoconf >= 2.62
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-gcc-c++
-# just to shorten build (libgettextlib is not packaged anyway)
-%{!?with_bootstrap:BuildRequires:	crossmingw32-glib2 >= 2.0}
 BuildRequires:	crossmingw32-libiconv
 BuildRequires:	libtool
 BuildRequires:	texinfo
@@ -42,6 +35,13 @@
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
+%define		optflags	-O2
+%endif
+# -z options are invalid for mingw linker
+%define		filterout_ld	-Wl,-z,.*
+
 %description
 gettext libraries - cross mingw32 version.
 
@@ -77,39 +77,37 @@
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__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 ../..
-%{__aclocal}
+cd ../../gettext-tools
+%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-
 %configure \
 	--target=%{target} \
 	--host=%{target} \
 	--disable-csharp \
-	--enable-static
+	--enable-static \
+	--without-git
 
-%{__make} \
-	SHELL=bash
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -138,7 +136,8 @@
 %{_libdir}/libintl.la
 %{_libdir}/libasprintf.dll.a
 %{_libdir}/libasprintf.la
-%{_includedir}/*.h
+%{_includedir}/autosprintf.h
+%{_includedir}/libintl.h
 
 %files static
 %defattr(644,root,root,755)
@@ -156,6 +155,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2010/06/20 10:39:23  qboosh
+- updated to 0.18.1.1
+- updated kill-tools patch
+- no glib2 or libunistring BR as tools are not built
+
 Revision 1.35  2010/01/22 01:02:30  lkrotowski
 - added bootstrap mode
 - disabled building gettext-tools (patch)

================================================================
Index: packages/crossmingw32-gettext/gettext-libintl_by_gcj.patch
diff -u packages/crossmingw32-gettext/gettext-libintl_by_gcj.patch:1.1 packages/crossmingw32-gettext/gettext-libintl_by_gcj.patch:1.2
--- packages/crossmingw32-gettext/gettext-libintl_by_gcj.patch:1.1	Fri Jan 22 02:00:09 2010
+++ packages/crossmingw32-gettext/gettext-libintl_by_gcj.patch	Sun Jun 20 12:39:23 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-gettext/crossmingw32-gettext-kill_tools.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-gettext/crossmingw32-gettext.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-gettext/gettext-libintl_by_gcj.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list