Ignore more source tarballs.

[fedora-mingw.git] / glib2 / mingw-glib2.spec

diff --git a/glib2/mingw-glib2.spec b/glib2/mingw-glib2.spec
index fe3e83f..7697a65 100644 (file)
--- a/glib2/mingw-glib2.spec
+++ b/glib2/mingw-glib2.spec
@@ -1,8 +1,12 @@
-%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-glib2
 Version:        2.18.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -15,12 +19,16 @@ BuildArch:      noarch
 
 Patch2:         gio-2.16-only-pass-uri-to-gio-apps.patch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-iconv
 BuildRequires:  mingw-gettext
-
+BuildRequires:  pkgconfig
+# Native version required for msgfmt use in build
+BuildRequires:  gettext
+# Native version required for glib-genmarshal
+BuildRequires:  glib2-devel
 
 %description
 MinGW Windows Glib2 library.
@@ -43,6 +51,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 
+# Remove manpages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,15 +104,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_datadir}/gtk-doc/html/glib/
 %{_mingw_datadir}/gtk-doc/html/gobject/
 %{_mingw_datadir}/locale/*/LC_MESSAGES/glib20.mo
-%{_mingw_mandir}/man1/glib-genmarshal.1*
-%{_mingw_mandir}/man1/glib-gettextize.1*
-%{_mingw_mandir}/man1/glib-mkenums.1*
-%{_mingw_mandir}/man1/gobject-query.1*
-%{_mingw_mandir}/man1/gtester-report.1*
-%{_mingw_mandir}/man1/gtester.1*
-
 
 
 %changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.0-3
+- Remove manpages which duplicate Fedora native.
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-2
+- Add BR on pkgconfig, gettext and glib2 (native)
+
 * Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 2.18.0-1
 - Initial RPM release