X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gtk2%2Fmingw-gtk2.spec;h=8c17f49f797654fab11e7e8153e11354aac50dae;hb=980bb6fa6d30d89d0d25df74930de24ae2dc1c2e;hp=0a90999067acffd74f11c16f3224c995926efda4;hpb=ae8f34545f03a94f98b08586b8c3bc4d24d13819;p=fedora-mingw.git

diff --git a/gtk2/mingw-gtk2.spec b/gtk2/mingw-gtk2.spec
index 0a90999..8c17f49 100644
--- a/gtk2/mingw-gtk2.spec
+++ b/gtk2/mingw-gtk2.spec
@@ -5,14 +5,17 @@
 %define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-gtk2
-Version:        2.14.0
-Release:        2%{?dist}
+Version:        2.14.2
+Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
+Patch1:         gtk+-2.11.1-set-invisible-char-to-bullet.patch
+Patch2:         gail-leaks.patch
+Patch3:         info-leak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,6 +32,18 @@ BuildRequires:  mingw-libpng
 BuildRequires:  mingw-libjpeg
 BuildRequires:  mingw-pango
 BuildRequires:  mingw-atk
+BuildRequires:  pkgconfig
+# Native one for msgfmt
+BuildRequires:  gettext
+# Native one for glib-genmarsjal
+BuildRequires:  glib2-devel
+# Native one for gtk-update-icon-cache
+BuildRequires:  gtk2
+# Native one for gdk-pixbuf-csource
+BuildRequires:  gtk2-devel
+
+Requires(post): wine
+
 
 %description
 MinGW Windows Gtk2 library.
@@ -36,7 +51,9 @@ MinGW Windows Gtk2 library.
 
 %prep
 %setup -q -n gtk+-%{version}
-
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 # Need to run the correct version of glib-mkenums.
@@ -53,10 +70,22 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 
+# Remove manpages which duplicate those in Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+wine %{_mingw_bindir}/gdk-pixbuf-query-loaders.exe \
+  > %{_mingw_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+
+%preun
+rm -f %{_mingw_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+
+
 %files
 %defattr(-,root,root)
 %{_mingw_datadir}/gtk-doc/html/gail-libgail-util
@@ -99,13 +128,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_sysconfdir}/gtk-2.0/
 %{_mingw_datadir}/aclocal/gtk-2.0.m4
 %{_mingw_datadir}/gtk-2.0/
-%{_mingw_mandir}/man1/gdk-pixbuf-csource.1*
-%{_mingw_mandir}/man1/gdk-pixbuf-query-loaders.1*
-%{_mingw_mandir}/man1/gtk-builder-convert.1*
-%{_mingw_mandir}/man1/gtk-query-immodules-2.0.1*
-%{_mingw_mandir}/man1/gtk-update-icon-cache.1*
+
 
 %changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.2-1
+- Update to 2.14.2 release
+
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-5
+- Remove manpages duplicating those in Fedora native packages.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.0-4
+- Added dep on pkgconfig, gettext and glib2 (native)
+
+* Thu Sep 11 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-3
+- post/preun scripts to update the gdk-pixbuf.loaders list.
+
 * Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-2
 - Jasper DLLs now fixed.
 - Fix source URL.