- updated to 2.30.0

[packages/crossmingw32-glib2.git] / crossmingw32-glib2.spec

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index d564856af6fa0db23ef196ea3460f4e21144db1c..24b08afea87af799115013e9d27b30cd0b475d3e 100644 (file)
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -11,25 +11,34 @@ Summary(pt_BR.UTF-8):       Conjunto de funções gráficas utilitárias
 Summary(tr.UTF-8):     Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 %define                realname   glib
-Name:          crossmingw32-%{realname}2
-Version:       2.24.1
+Name:          crossmingw32-glib2
+Version:       2.30.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: 6a7db81c9a2cffe6a34dadb57d7ba2d2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-%{version}.tar.xz
+# Source0-md5: 68ac9516233044f27e76577d4f4e6de9
 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.11
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-gettext
+BuildRequires: crossmingw32-libffi >= 3.0.0
 BuildRequires: crossmingw32-libiconv
-BuildRequires: crossmingw32-pcre >= 7.8
-BuildRequires: libtool
-BuildRequires: pkgconfig >= 1:0.16.0
+BuildRequires: crossmingw32-pcre >= 8.11
+BuildRequires: crossmingw32-zlib
+# host glib-genmarshall and glib-compile-schemas are needed for cross-compiling
+BuildRequires: glib2 >= 1:2.28.0
+BuildRequires: gtk-doc >= 1.15
+BuildRequires: libtool >= 2:2.2
+BuildRequires: pkgconfig >= 1:0.16
+BuildRequires: python >= 1:2.5
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires:      crossmingw32-gettext
-Requires:      crossmingw32-pcre >= 7.8
+Requires:      crossmingw32-pcre >= 8.11
+ExcludeArch:   i386
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -47,8 +56,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                __cxx                   %{target}-g++
 
 %ifnarch %{ix86}
-# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
-%define                optflags        -O2
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc.
+# now at least i486 is required for atomic operations
+%define                optflags        -O2 -march=i486
 %endif
 # -z options are invalid for mingw linker
 %define                filterout_ld    -Wl,-z,.*
@@ -111,7 +121,8 @@ Summary:    DLL glib2 libraries for Windows
 Summary(pl.UTF-8):     Biblioteki DLL glib2 dla Windows
 Group:         Applications/Emulators
 Requires:      crossmingw32-gettext-dll
-Requires:      crossmingw32-pcre-dll >= 7.8
+Requires:      crossmingw32-libffi-dll >= 3.0.0
+Requires:      crossmingw32-pcre-dll >= 8.11
 Requires:      wine
 
 %description dll
@@ -136,6 +147,7 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
        --target=%{target} \
        --host=%{target} \
        --disable-gtk-doc \
+       --disable-silent-rules \
        --enable-shared \
        --with-pcre=system
 
@@ -155,11 +167,13 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{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,gdb,glib-2.0,gtk-doc,man} \
+       $RPM_BUILD_ROOT%{_libdir}/gdbus-2.0/codegen \
+       $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
@@ -181,11 +195,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_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