rpms/mingw32-gtk2/devel mingw32-gtk2.spec, 1.22, 1.23 mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch, 1.1, NONE

[epienbro]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11918

Modified Files:
	mingw32-gtk2.spec 
Removed Files:
	mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch 
Log Message:
* Sat Oct 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.3-1
- Update to 2.18.3
- Drop upstreamed patch (GNOME BZ #597535)
- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
- This release contains a workaround for a rendering bug which got
  introduced during the CSW merge (GNOME BZ #598299)



Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- mingw32-gtk2.spec	6 Oct 2009 15:03:04 -0000	1.22
+++ mingw32-gtk2.spec	17 Oct 2009 15:48:06 -0000	1.23
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.18.2
+Version:        2.18.3
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -33,9 +33,6 @@ Patch1001:      mingw32-gtk2-enable_stat
 # Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
 Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
 
-# GNOME Bugzilla #597535
-Patch1003:      mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -97,7 +94,6 @@ Static version of the MinGW Windows Gtk2
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0
-%patch1003 -p0
 
 # Regenerate the configure script
 aclocal
@@ -109,7 +105,7 @@ libtoolize
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --with-libjasper
+%{_mingw32_configure} --disable-cups --enable-static --enable-gdiplus --with-libjasper
 make %{?_smp_mflags}
 
 
@@ -207,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la
-%if 0
+%if 1
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.la
@@ -242,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %endif
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll.a
@@ -264,9 +263,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
@@ -321,26 +317,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
+%if 0
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
+%endif
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 
 %changelog
+* Sat Oct 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.3-1
+- Update to 2.18.3
+- Drop upstreamed patch (GNOME BZ #597535)
+- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
+- This release contains a workaround for a rendering bug which got
+  introduced during the CSW merge (GNOME BZ #598299)
+
 * Tue Oct  6 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.18.2-1
 - Update to 2.18.2
 


--- mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch DELETED ---