From 85ef65c0ae3138605c804098316e20894ec67dd9 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Dec 06 2010 16:56:13 +0000 Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/mingw32-glib2 Conflicts: .gitignore mingw32-glib2.spec sources --- diff --git a/.gitignore b/.gitignore index 737cf33..50b4d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ glib-2.24.1.tar.bz2 glib-2.25.12.tar.bz2 -/glib-2.27.4.tar.bz2 +glib-2.27.4.tar.bz2 +glib-2.25.15.tar.bz2 +glib-2.25.17.tar.bz2 +glib-2.26.0.tar.bz2 diff --git a/mingw32-glib2.spec b/mingw32-glib2.spec index d89689c..00d58ce 100644 --- a/mingw32-glib2.spec +++ b/mingw32-glib2.spec @@ -13,7 +13,7 @@ Summary: MinGW Windows GLib2 library License: LGPLv2+ Group: Development/Libraries URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.23/glib-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/glib/2.26/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,6 +34,11 @@ BuildRequires: glib2-devel Requires: pkgconfig +# As we're using libproxy-intl the libintl-8.dll dependency is a soft one +# To compile applications against glib2 we need to have gettext installed +# for it's headers +Requires: mingw32-gettext + %description MinGW Windows Glib2 library. @@ -47,7 +52,7 @@ Group: Development/Libraries Static version of the MinGW Windows GLib2 library. -%{_mingw32_debug_package} +%{?_mingw32_debug_package} %prep @@ -55,6 +60,10 @@ Static version of the MinGW Windows GLib2 library. %build +# Make sure that libtool doesn't complain that it can't find +# the 'real file for library -lintl' +export lt_cv_deplibs_check_method="pass_all" + # GLib can't build static and shared libraries in one go, so we # build GLib twice here mkdir build_static @@ -125,6 +134,19 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc +# Bash-completion files aren't interesting for mingw32 +rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d + +# The libtool files refer to libintl while they shouldn't +# Drop this reference manually +find $RPM_BUILD_ROOT -name \*.la -exec sed -i s@' -lintl'@@ {} \; + +# Let binaries depending on GLib link against libproxy-intl in a way that libtool doesn't refuse +sed -i s@"inherited_linker_flags=''"@"inherited_linker_flags='-Wl,%{_mingw32_libdir}/libintl.a -Wl,--exclude-libs=libintl.a -lkernel32 -lmsvcrt'"@ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la + +# Drop the reference to libintl from the pgkconfig and .la files as it's a soft dependency now +sed -i s/" -lintl"// $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/glib-2.0.pc + %find_lang glib20 @@ -134,11 +156,14 @@ rm -rf $RPM_BUILD_ROOT %files -f glib20.lang %defattr(-,root,root,-) +%{_mingw32_bindir}/gdbus.exe +%{_mingw32_bindir}/glib-compile-schemas.exe %{_mingw32_bindir}/glib-genmarshal.exe %{_mingw32_bindir}/glib-gettextize %{_mingw32_bindir}/glib-mkenums %{_mingw32_bindir}/gobject-query.exe %{_mingw32_bindir}/gio-querymodules.exe +%{_mingw32_bindir}/gsettings.exe %{_mingw32_bindir}/gspawn-win32-helper-console.exe %{_mingw32_bindir}/gspawn-win32-helper.exe %{_mingw32_bindir}/libgio-2.0-0.dll @@ -147,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/libgobject-2.0-0.dll %{_mingw32_bindir}/libgthread-2.0-0.dll %{_mingw32_includedir}/glib-2.0/ +%{_mingw32_includedir}/gio-win32-2.0/ %{_mingw32_libdir}/gio-2.0.def %{_mingw32_libdir}/glib-2.0.def %{_mingw32_libdir}/glib-2.0/ @@ -164,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgthread-2.0.dll.a %{_mingw32_libdir}/libgthread-2.0.la %{_mingw32_libdir}/pkgconfig/gio-2.0.pc +%{_mingw32_libdir}/pkgconfig/gio-windows-2.0.pc %{_mingw32_libdir}/pkgconfig/glib-2.0.pc %{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc %{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc @@ -172,6 +199,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/pkgconfig/gthread-2.0.pc %{_mingw32_datadir}/aclocal/glib-2.0.m4 %{_mingw32_datadir}/aclocal/glib-gettext.m4 +%{_mingw32_datadir}/aclocal/gsettings.m4 %{_mingw32_datadir}/glib-2.0/ %files static @@ -187,6 +215,28 @@ rm -rf $RPM_BUILD_ROOT * Mon Dec 6 2010 Thomas Sailer - 2.27.4-1 - update to 2.27.4 +* Sun Nov 7 2010 Erik van Pienbroek - 2.26.0-4 +- Fix a build failure in mingw32-libsoup and mingw32-webkitgtk + +* Sun Oct 17 2010 Erik van Pienbroek - 2.26.0-3 +- Let binaries depending on GLib link against the libintl wrapper library + in a way that libtool doesn't refuse + +* Sat Oct 16 2010 Erik van Pienbroek - 2.26.0-2 +- Rebuild in order to make libintl-8.dll a soft dependency + +* Mon Oct 11 2010 Erik van Pienbroek - 2.26.0-1 +- Update to 2.26.0 + +* Thu Sep 23 2010 Erik van Pienbroek - 2.25.17-1 +- Update to 2.25.17 + +* Sun Sep 12 2010 Erik van Pienbroek - 2.25.15-1 +- Update to 2.25.15 + +* Wed Aug 11 2010 David Malcolm - 2.25.12-2 +- recompiling .py files against Python 2.7 (rhbz#623338) + * Thu Aug 5 2010 Thomas Sailer - 2.25.12-1 - update to 2.25.12