Don't build qt-win for now.

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

diff --git a/gtk2/mingw32-gtk2.spec b/gtk2/mingw32-gtk2.spec
index e89f173..d7a44b5 100644 (file)
--- a/gtk2/mingw32-gtk2.spec
+++ b/gtk2/mingw32-gtk2.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-gtk2
 Version:        2.15.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -20,21 +20,26 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
 Source1:        gdk-pixbuf.loaders
 
+# Fix use of extended buttons in gtkstatusicon.
+Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-iconv
+
+BuildRequires:  mingw32-atk >= 1.13.0
+BuildRequires:  mingw32-cairo >= 1.8.0
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-glib2 >= 2.17.7
-BuildRequires:  mingw32-cairo >= 1.8.0
+BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-jasper
-BuildRequires:  mingw32-libpng >= 1.2.2
 BuildRequires:  mingw32-libjpeg
+BuildRequires:  mingw32-libpng >= 1.2.2
 BuildRequires:  mingw32-pango >= 1.20.0
-BuildRequires:  mingw32-atk >= 1.13.0
 BuildRequires:  pkgconfig
+
 # Native one for msgfmt
 BuildRequires:  gettext
 # Native one for glib-genmarsjal
@@ -44,6 +49,8 @@ BuildRequires:  gtk2
 # Native one for gdk-pixbuf-csource
 BuildRequires:  gtk2-devel
 
+Requires:       pkgconfig
+
 
 %description
 MinGW Windows Gtk2 library.
@@ -52,6 +59,8 @@ MinGW Windows Gtk2 library.
 %prep
 %setup -q -n gtk+-%{version}
 
+%patch1000 -p1
+
 
 %build
 # Need to run the correct version of glib-mkenums.
@@ -125,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 30 2009 Richard W.M. Jones <rjones@redhat.com> - 2.15.0-2
+- Requires pkgconfig.
+
 * Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.15.0-1
 - Rebase to Fedora native version 2.15.0.
 - Disable static libraries.