X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gtk2%2Fmingw32-gtk2.spec;h=834bb5ea0558800037d934ef0d66dc8210a43d3c;hb=569fd9677db6620712d65edc748129bd22eba88d;hp=f4a6744bdae701444219a137b88329c87c7a7e49;hpb=14bb5f7a7a8110b0c21eef08c532bd7f18c42e8e;p=fedora-mingw.git

diff --git a/gtk2/mingw32-gtk2.spec b/gtk2/mingw32-gtk2.spec
index f4a6744..834bb5e 100644
--- a/gtk2/mingw32-gtk2.spec
+++ b/gtk2/mingw32-gtk2.spec
@@ -5,8 +5,8 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gtk2
-Version:        2.14.2
-Release:        2%{?dist}
+Version:        2.14.4
+Release:        3%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -14,10 +14,12 @@ 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:
+# wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
+Source1:        gdk-pixbuf.loaders
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 23
@@ -26,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
@@ -42,8 +44,6 @@ BuildRequires:  gtk2
 # Native one for gdk-pixbuf-csource
 BuildRequires:  gtk2-devel
 
-Requires(post): wine
-
 
 %description
 MinGW Windows Gtk2 library.
@@ -52,14 +52,12 @@ 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.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure}
+%{_mingw32_configure} --disable-cups
 make
 
 
@@ -73,19 +71,15 @@ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
 # Remove manpages which duplicate those in Fedora native.
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
+# Install gdk-pixbuf.loaders.
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe \
-  > %{_mingw32_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-
-%preun
-rm -f %{_mingw32_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-
-
 %files
 %defattr(-,root,root)
 %{_mingw32_datadir}/gtk-doc/html/gail-libgail-util
@@ -131,6 +125,18 @@ 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.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.2-2
 - Rename mingw -> mingw32.