X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gtk2%2Fmingw-gtk2.spec;h=9b2b44ccdb3db3830644e92d6e54b72afde241df;hb=25b3b07a54f28bf76b586935e299e34ab2e9700c;hp=e6de6b71a00825fc60bf3ff7cbdd41291118b398;hpb=2e1b8617ce0ac4fe1574cb5caedd2296cd481ef5;p=fedora-mingw.git

diff --git a/gtk2/mingw-gtk2.spec b/gtk2/mingw-gtk2.spec
index e6de6b7..9b2b44c 100644
--- a/gtk2/mingw-gtk2.spec
+++ b/gtk2/mingw-gtk2.spec
@@ -1,19 +1,23 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-gtk2
 Version:        2.14.0
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/gtk/2.14/gtk+-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-iconv
@@ -25,6 +29,18 @@ BuildRequires:  mingw-libpng
 BuildRequires:  mingw-libjpeg
 BuildRequires:  mingw-pango
 BuildRequires:  mingw-atk
+BuildRequires:  pkgconfig
+# Native one for msgfmt
+BuildRequires:  gettext
+# Native one for glib-genmarsjal
+BuildRequires:  glib2-devel
+# Native one for gtk-update-icon-cache
+BuildRequires:  gtk2
+# Native one for gdk-pixbuf-csource
+BuildRequires:  gtk2-devel
+
+Requires(post): wine
+
 
 %description
 MinGW Windows Gtk2 library.
@@ -35,8 +51,10 @@ MinGW Windows Gtk2 library.
 
 
 %build
-# XXX fix jasper dlls
-%{_mingw_configure} --without-jasper
+# Need to run the correct version of glib-mkenums.
+PATH=%{_mingw_bindir}:$PATH
+
+%{_mingw_configure}
 make
 
 
@@ -51,6 +69,14 @@ rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+wine %{_mingw_bindir}/gdk-pixbuf-query-loaders.exe \
+  > %{_mingw_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+
+%preun
+rm -f %{_mingw_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+
+
 %files
 %defattr(-,root,root)
 %{_mingw_datadir}/gtk-doc/html/gail-libgail-util
@@ -99,6 +125,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_mandir}/man1/gtk-query-immodules-2.0.1*
 %{_mingw_mandir}/man1/gtk-update-icon-cache.1*
 
+
 %changelog
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.0-4
+- Added dep on pkgconfig, gettext and glib2 (native)
+
+* Thu Sep 11 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-3
+- post/preun scripts to update the gdk-pixbuf.loaders list.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.14.0-2
+- Jasper DLLs now fixed.
+- Fix source URL.
+- Run the correct glib-mkenums.
+
 * Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.14.0-1
 - Initial RPM release