- updated to 2.18.4

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

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index ac7dd2576592204bb51c74826cbfb8703339eca7..664ee2d9cab81b8609f6dcf87e884699b877834a 100644 (file)
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -10,23 +10,26 @@ Summary(pl.UTF-8):  Biblioteka zawierająca wiele użytecznych funkcji C - wersja
 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.12.9
+%define                realname   glib
+Name:          crossmingw32-%{realname}2
+Version:       2.18.4
 Release:       1
-License:       LGPL
+License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       ftp://ftp.gtk.org/pub/glib/2.12/%{_realname}-%{version}.tar.bz2
-# Source0-md5: b3f6a2a318610af6398b3445f1a2d6c6
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-%{version}.tar.bz2
+# Source0-md5: ec25ed261534d870141000ab73f1a2bf
 Patch0:                %{name}-stacktest.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.54
-BuildRequires: automake
+BuildRequires: automake >= 1:1.7
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-gettext
 BuildRequires: crossmingw32-libiconv
+BuildRequires: crossmingw32-pcre >= 7.8
 BuildRequires: libtool
+BuildRequires: pkgconfig >= 1:0.16.0
 Requires:      crossmingw32-gettext
+Requires:      crossmingw32-pcre >= 7.8
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -34,15 +37,22 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                target                  i386-mingw32
 %define                host                    %{target}
 %define                target_platform         %{target}
-%define                arch                    %{_prefix}/%{target}
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
 %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
 GLib, is a library which includes support routines for C such as
 lists, trees, hashes, memory allocation, and many other things. GLIB
@@ -101,6 +111,7 @@ 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:      wine
 
 %description dll
@@ -110,11 +121,11 @@ DLL glib2 libraries for Windows.
 Biblioteki DLL glib2 dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
 %{__aclocal}
 %{__automake}
@@ -123,7 +134,8 @@ export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
        --target=%{target} \
        --host=%{target} \
        --disable-gtk-doc \
-       --enable-shared
+       --enable-shared \
+       --with-pcre=system
 
 %{__make}
 
@@ -152,14 +164,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_libdir}/libgio-2.0.dll.a
 %{_libdir}/libglib-2.0.dll.a
 %{_libdir}/libgmodule-2.0.dll.a
 %{_libdir}/libgobject-2.0.dll.a
 %{_libdir}/libgthread-2.0.dll.a
+%{_libdir}/libgio-2.0.la
 %{_libdir}/libglib-2.0.la
 %{_libdir}/libgmodule-2.0.la
 %{_libdir}/libgobject-2.0.la
 %{_libdir}/libgthread-2.0.la
+%{_libdir}/gio-2.0.def
 %{_libdir}/glib-2.0.def
 %{_libdir}/gmodule-2.0.def
 %{_libdir}/gobject-2.0.def
@@ -168,10 +183,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/glib-2.0
 %dir %{_libdir}/glib-2.0/include
 %{_libdir}/glib-2.0/include/glibconfig.h
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/gio-2.0.pc
+%{_pkgconfigdir}/glib-2.0.pc
+%{_pkgconfigdir}/gmodule-2.0.pc
+%{_pkgconfigdir}/gmodule-export-2.0.pc
+%{_pkgconfigdir}/gmodule-no-export-2.0.pc
+%{_pkgconfigdir}/gobject-2.0.pc
+%{_pkgconfigdir}/gthread-2.0.pc
 
 %files dll
 %defattr(644,root,root,755)
+%{_dlldir}/libgio-2.0-*.dll
 %{_dlldir}/libglib-2.0-*.dll
 %{_dlldir}/libgmodule-2.0-*.dll
 %{_dlldir}/libgobject-2.0-*.dll