packages: crossmingw32-glib2/crossmingw32-glib2-stacktest.patch, crossmingw...

[qboosh]

Author: qboosh                       Date: Sun Oct  3 18:10:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.26.0

---- Files affected:
packages/crossmingw32-glib2:
   crossmingw32-glib2-stacktest.patch (1.1 -> 1.2) , crossmingw32-glib2.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: packages/crossmingw32-glib2/crossmingw32-glib2-stacktest.patch
diff -u packages/crossmingw32-glib2/crossmingw32-glib2-stacktest.patch:1.1 packages/crossmingw32-glib2/crossmingw32-glib2-stacktest.patch:1.2
--- packages/crossmingw32-glib2/crossmingw32-glib2-stacktest.patch:1.1	Tue Mar  6 14:39:44 2007
+++ packages/crossmingw32-glib2/crossmingw32-glib2-stacktest.patch	Sun Oct  3 20:10:50 2010
@@ -1,5 +1,5 @@
---- glib-2.12.9/configure.in.orig	2007-01-17 00:24:39.000000000 +0100
-+++ glib-2.12.9/configure.in	2007-03-06 11:44:09.683703523 +0100
+--- glib-2.12.9/configure.ac.orig	2007-01-17 00:24:39.000000000 +0100
++++ glib-2.12.9/configure.ac	2007-03-06 11:44:09.683703523 +0100
 @@ -629,7 +629,9 @@
  	glib_cv_stack_grows=no
          ,

================================================================
Index: packages/crossmingw32-glib2/crossmingw32-glib2.spec
diff -u packages/crossmingw32-glib2/crossmingw32-glib2.spec:1.48 packages/crossmingw32-glib2/crossmingw32-glib2.spec:1.49
--- packages/crossmingw32-glib2/crossmingw32-glib2.spec:1.48	Mon Aug  9 22:15:50 2010
+++ packages/crossmingw32-glib2/crossmingw32-glib2.spec	Sun Oct  3 20:10:51 2010
@@ -13,21 +13,23 @@
 Summary(zh_CN.UTF-8):	实用工具函数库
 %define		realname   glib
 Name:		crossmingw32-%{realname}2
-Version:	2.24.2
+Version:	2.26.0
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-%{version}.tar.bz2
-# Source0-md5:	8a6e45d7840460ed84288ebfd75782d4
+# Source0-md5:	9b7dc61f5e389e1cff277a6350c37397
 Patch0:		%{name}-stacktest.patch
 URL:		http://www.gtk.org/
-BuildRequires:	autoconf >= 2.54
-BuildRequires:	automake >= 1:1.7
+BuildRequires:	autoconf >= 2.62
+BuildRequires:	automake >= 1:1.10
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-gettext
 BuildRequires:	crossmingw32-libiconv
 BuildRequires:	crossmingw32-pcre >= 7.8
-BuildRequires:	libtool
+# host glib-genmarshall and glib-compile-schemas are needed for cross-compiling
+BuildRequires:	glib2 >= 1:2.26.0
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig >= 1:0.16.0
 Requires:	crossmingw32-gettext
 Requires:	crossmingw32-pcre >= 7.8
@@ -156,11 +158,12 @@
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/charset.alias
 # use system glib2-devel instead
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,glib-2.0,gtk-doc,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,glib-2.0,gtk-doc,man} \
+	$RPM_BUILD_ROOT/etc/bash_completion.d
 # runtime
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -182,11 +185,13 @@
 %{_libdir}/gmodule-2.0.def
 %{_libdir}/gobject-2.0.def
 %{_libdir}/gthread-2.0.def
+%{_includedir}/gio-win32-2.0
 %{_includedir}/glib-2.0
 %dir %{_libdir}/glib-2.0
 %dir %{_libdir}/glib-2.0/include
 %{_libdir}/glib-2.0/include/glibconfig.h
 %{_pkgconfigdir}/gio-2.0.pc
+%{_pkgconfigdir}/gio-windows-2.0.pc
 %{_pkgconfigdir}/glib-2.0.pc
 %{_pkgconfigdir}/gmodule-2.0.pc
 %{_pkgconfigdir}/gmodule-export-2.0.pc
@@ -208,6 +213,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2010/10/03 18:10:51  qboosh
+- updated to 2.26.0
+
 Revision 1.48  2010/08/09 20:15:50  qboosh
 - updated to 2.24.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-glib2/crossmingw32-glib2-stacktest.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-glib2/crossmingw32-glib2.spec?r1=1.48&r2=1.49&f=u