X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gtk2%2Fmingw32-gtk2.spec;h=e99dab923618c3ccbdb10b384213698abb87bfbd;hb=0b25e82087530b8ab392de7cb50ea1a416d8da37;hp=e89f173ddd90ea93a05d2f3e7bbbcee5108529ee;hpb=a35b6845b0193e3e14e6cd994cfdffa969655fbe;p=fedora-mingw.git

diff --git a/gtk2/mingw32-gtk2.spec b/gtk2/mingw32-gtk2.spec
index e89f173..e99dab9 100644
--- 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:        3%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -20,21 +20,30 @@ 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-dlfcn
 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:  mingw32-pixman
+BuildRequires:  mingw32-zlib
+
 BuildRequires:  pkgconfig
+
 # Native one for msgfmt
 BuildRequires:  gettext
 # Native one for glib-genmarsjal
@@ -44,6 +53,8 @@ BuildRequires:  gtk2
 # Native one for gdk-pixbuf-csource
 BuildRequires:  gtk2-devel
 
+Requires:       pkgconfig
+
 
 %description
 MinGW Windows Gtk2 library.
@@ -52,6 +63,8 @@ MinGW Windows Gtk2 library.
 %prep
 %setup -q -n gtk+-%{version}
 
+%patch1000 -p1
+
 
 %build
 # Need to run the correct version of glib-mkenums.
@@ -71,6 +84,9 @@ rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
 # Remove manpages which duplicate those in Fedora native.
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
+# Remove documentation too.
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+
 # 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/
@@ -84,10 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%{_mingw32_datadir}/gtk-doc/html/gail-libgail-util
-%{_mingw32_datadir}/gtk-doc/html/gdk-pixbuf
-%{_mingw32_datadir}/gtk-doc/html/gdk
-%{_mingw32_datadir}/gtk-doc/html/gtk
+%doc COPYING
 %{_mingw32_datadir}/themes/*
 %{_mingw32_bindir}/gdk-pixbuf-csource.exe
 %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe
@@ -125,6 +138,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb  6 2009 Richard W.M. Jones <rjones@redhat.com> - 2.15.0-3
+- Remove documentation.
+- Add license file.
+- Added extra BRs suggested by auto-buildrequires.
+
+* 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.