X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-glib2.spec;h=664ee2d9cab81b8609f6dcf87e884699b877834a;hb=ba1665f574b607b11632d8f5d41db070e36b37e6;hp=135dffb9e70045c0e37e65a6fe63efc898bd0318;hpb=0e2b3488b63810efe4db6d0a82d63b01749848cc;p=packages%2Fcrossmingw32-glib2.git

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index 135dffb..664ee2d 100644
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -10,35 +10,49 @@ 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
-Group:		Libraries
-#Source0:	ftp://ftp.gtk.org/pub/glib/2.12/win32/glib-dev-%{version}.zip
-Source0:	ftp://ftp.gtk.org/pub/glib/2.12/%{_realname}-%{version}.tar.bz2
-# Source0-md5:	b3f6a2a318610af6398b3445f1a2d6c6
+License:	LGPL v2+
+Group:		Development/Libraries
+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:	unzip
-Requires:	crossmingw32-binutils
+BuildRequires:	autoconf >= 2.54
+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
 
 %define		target			i386-mingw32
-%define		target_platform 	i386-pc-mingw32
-%define		arch			%{_prefix}/%{target}
-%define		gccarch			%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib			%{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define		host			%{target}
+%define		target_platform 	%{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
@@ -68,7 +82,6 @@ Kirjasto, jossa on työkalufunktioita. Kehitysversiot ja
 header-tiedostot ovat glib-devel-paketissa.
 
 %description -l ja.UTF-8
-
 GLibはユーティリティ関数を集めた便利なライブラリです。このＣ言語用ライブラリは、
 いくつかの問題を解決するよう設計されており、多くのプログラムから要求される使いやすい
 関数を提供します。
@@ -93,46 +106,95 @@ arquivos de inclusão estão em glib-devel.
 Yararlı yordamlar kitaplığı. Geliştirme kitaplıkları ve başlık
 dosyaları glib-devel paketinde yer almaktadır.
 
+%package dll
+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
+DLL glib2 libraries for Windows.
+
+%description dll -l pl.UTF-8
+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}
 %{__autoconf}
 %configure \
-	AR="%{target}-ar" \
-	RANLIB="%{target}-ranlib" \
-	--host=%{target}
+	--target=%{target} \
+	--host=%{target} \
+	--disable-gtk-doc \
+	--enable-shared \
+	--with-pcre=system
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT%{arch}/share
-#
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang glib20 --with-gnome
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
+# use system glib2-devel instead
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,glib-2.0,gtk-doc,man}
+# runtime
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f glib20.lang
+%files
 %defattr(644,root,root,755)
-%dir %{_includedir}/glib-2.0
+%{_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
+%{_libdir}/gthread-2.0.def
 %{_includedir}/glib-2.0
-%{_libdir}/*.la
-%{_libdir}/*.a
+%dir %{_libdir}/glib-2.0
 %dir %{_libdir}/glib-2.0/include
 %{_libdir}/glib-2.0/include/glibconfig.h
-%{_pkgconfigdir}/*.pc
-%{_datadir}/aclocal/glib*
-%dir %{_datadir}/glib-2.0/gettext
-%attr(755,root,root) %{_datadir}/glib-2.0/gettext/mkinstalldirs
-%dir %{_datadir}/glib-2.0/gettext/po
-%{_datadir}/glib-2.0/gettext/po/*
+%{_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
+%{_dlldir}/libgthread-2.0-*.dll