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

diff --git a/gtk2/mingw32-gtk2.spec b/gtk2/mingw32-gtk2.spec
index f4a6744..e99dab9 100644
--- a/gtk2/mingw32-gtk2.spec
+++ b/gtk2/mingw32-gtk2.spec
@@ -5,34 +5,45 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-gtk2
-Version:        2.14.2
-Release:        2%{?dist}
+Version:        2.15.0
+Release:        3%{?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
-Patch1:         gtk+-2.11.1-set-invisible-char-to-bullet.patch
-Patch2:         gail-leaks.patch
-Patch3:         info-leak.patch
+Source0:        http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
+
 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
+
+# Fix use of extended buttons in gtkstatusicon.
+Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
+
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 23
+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
-BuildRequires:  mingw32-cairo
+BuildRequires:  mingw32-glib2 >= 2.17.7
+BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-jasper
-BuildRequires:  mingw32-libpng
 BuildRequires:  mingw32-libjpeg
-BuildRequires:  mingw32-pango
-BuildRequires:  mingw32-atk
+BuildRequires:  mingw32-libpng >= 1.2.2
+BuildRequires:  mingw32-pango >= 1.20.0
+BuildRequires:  mingw32-pixman
+BuildRequires:  mingw32-zlib
+
 BuildRequires:  pkgconfig
+
 # Native one for msgfmt
 BuildRequires:  gettext
 # Native one for glib-genmarsjal
@@ -42,7 +53,7 @@ BuildRequires:  gtk2
 # Native one for gdk-pixbuf-csource
 BuildRequires:  gtk2-devel
 
-Requires(post): wine
+Requires:       pkgconfig
 
 
 %description
@@ -51,16 +62,16 @@ MinGW Windows Gtk2 library.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
+%patch1000 -p1
+
 
 %build
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure}
-make
+%{_mingw32_configure} --disable-cups --disable-static
+make %{?_smp_mflags}
 
 
 %install
@@ -73,27 +84,23 @@ 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
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# 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/
 
+%find_lang %{name} --all-name
 
-%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
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%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
-%{_mingw32_datadir}/locale/*/LC_MESSAGES/gtk20-properties.mo
-%{_mingw32_datadir}/locale/*/LC_MESSAGES/gtk20.mo
+%doc COPYING
 %{_mingw32_datadir}/themes/*
 %{_mingw32_bindir}/gdk-pixbuf-csource.exe
 %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe
@@ -131,6 +138,32 @@ rm -f %{_mingw32_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 
 
 %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.
+- Use _smp_mflags.
+- Use find_lang macro.
+
+* 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.