Added expat.

[fedora-mingw.git] / gtk2 / mingw32-gtk2.spec

diff --git a/gtk2/mingw32-gtk2.spec b/gtk2/mingw32-gtk2.spec
index c9f1e19..834bb5e 100644 (file)
--- a/gtk2/mingw32-gtk2.spec
+++ b/gtk2/mingw32-gtk2.spec
@@ -5,7 +5,7 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gtk2
-Version:        2.14.2
+Version:        2.14.4
 Release:        3%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -14,8 +14,6 @@ Group:          Development/Libraries
 URL:            http://www.gtk.org
 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)
 
 # If you want to rebuild this, do:
@@ -30,7 +28,7 @@ BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-glib2
-BuildRequires:  mingw32-cairo
+BuildRequires:  mingw32-cairo >= 1.8.0
 BuildRequires:  mingw32-jasper
 BuildRequires:  mingw32-libpng
 BuildRequires:  mingw32-libjpeg
@@ -54,8 +52,6 @@ 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.
@@ -84,10 +80,6 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
 rm -rf $RPM_BUILD_ROOT
 
 
-%preun
-rm -f %{_mingw32_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-
-
 %files
 %defattr(-,root,root)
 %{_mingw32_datadir}/gtk-doc/html/gail-libgail-util
@@ -133,6 +125,14 @@ rm -f %{_mingw32_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 
 
 %changelog
+* Mon Oct 27 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.4-3
+- Remove preun script, no longer used.
+
+* Fri Oct 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.4-1
+- New upstream version 2.14.4.
+- Require cairo >= 1.8.0 because of important fixes.
+- Remove a couple of patches which are now upstream.
+
 * Fri Oct 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.2-3
 - Remove the requirement for Wine at build or install time.
 - Conflicts with (native) cups-devel.