Use RPM macros from mingw-filesystem.

diff --git a/gettext/mingw-gettext.spec b/gettext/mingw-gettext.spec
index 81f05fe..b8acaa2 100644 (file)
--- a/gettext/mingw-gettext.spec
+++ b/gettext/mingw-gettext.spec
@@ -1,8 +1,8 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%include /usr/lib/rpm/mingw-defs
 
 Name:      mingw-gettext
 Version:   0.17
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -11,12 +11,13 @@ URL:       http://www.gnu.org/software/gettext/
 Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch: noarch
+
 BuildRequires: mingw-gcc
 BuildRequires: mingw-gcc-c++
 BuildRequires: mingw-binutils
 BuildRequires: mingw-iconv
 
-Requires:       mingw-runtime
 
 %description
 MinGW Windows Gettext library
@@ -25,11 +26,7 @@ MinGW Windows Gettext library
 %setup -q -n gettext-%{version}
 
 %build
-CFLAGS="-O2 -g -Wall -pipe" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw \
+%{_mingw_configure} \
   --disable-java \
   --disable-native-java \
   --disable-csharp \
@@ -41,95 +38,90 @@ make
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/locale/locale.alias
+rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/locale/locale.alias
+rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/autopoint
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/envsubst.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gettext.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gettext.sh
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gettextize
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libasprintf-0.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgettextlib-0-17.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgettextpo-0.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgettextsrc-0-17.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libintl-8.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/msg*.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/ngettext.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/recode-sr-latin.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/xgettext.exe
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/autosprintf.h
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gettext-po.h
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/libintl.h
-
-%dir %{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/gettext/
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/gettext/hostname.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/gettext/project-id
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/gettext/urlget.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/gettext/user-email
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/charset.alias
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libasprintf.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libasprintf.dll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libasprintf.la
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgettextlib.dll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgettextlib.la
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgettextpo.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgettextpo.dll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgettextpo.la
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgettextsrc.dll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgettextsrc.la
-
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libintl.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libintl.dll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libintl.la
-
-%dir %{_prefix}/i686-pc-mingw32/sys-root/mingw/share/doc/gettext
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/doc/gettext/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/doc/libasprintf/*
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/emacs/site-lisp/*
-
-%dir %{_prefix}/i686-pc-mingw32/sys-root/mingw/share/gettext/
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/gettext/*
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*m4
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/autosprintf.info
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/gettext.info
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/locale/*/LC_MESSAGES/gettext-tools.mo
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/locale/*/LC_MESSAGES/gettext-runtime.mo
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/autopoint.1*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/envsubst.1*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/gettext.1*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/gettextize.1*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/msg*1*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/ngettext.1*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/recode-sr-latin.1*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/xgettext.1*
-
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/bind_textdomain_codeset.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/bindtextdomain.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/dcgettext.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/dcngettext.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/dgettext.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/dngettext.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/gettext.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/ngettext.3*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/textdomain.3*
+%{_mingw_bindir}/autopoint
+%{_mingw_bindir}/envsubst.exe
+%{_mingw_bindir}/gettext.exe
+%{_mingw_bindir}/gettext.sh
+%{_mingw_bindir}/gettextize
+%{_mingw_bindir}/libasprintf-0.dll
+%{_mingw_bindir}/libgettextlib-0-17.dll
+%{_mingw_bindir}/libgettextpo-0.dll
+%{_mingw_bindir}/libgettextsrc-0-17.dll
+%{_mingw_bindir}/libintl-8.dll
+%{_mingw_bindir}/msg*.exe
+%{_mingw_bindir}/ngettext.exe
+%{_mingw_bindir}/recode-sr-latin.exe
+%{_mingw_bindir}/xgettext.exe
+
+%{_mingw_includedir}/autosprintf.h
+%{_mingw_includedir}/gettext-po.h
+%{_mingw_includedir}/libintl.h
+
+%{_mingw_libdir}/gettext
+
+%{_mingw_libdir}/libasprintf.a
+%{_mingw_libdir}/libasprintf.dll.a
+%{_mingw_libdir}/libasprintf.la
+
+%{_mingw_libdir}/libgettextlib.dll.a
+%{_mingw_libdir}/libgettextlib.la
+
+%{_mingw_libdir}/libgettextpo.a
+%{_mingw_libdir}/libgettextpo.dll.a
+%{_mingw_libdir}/libgettextpo.la
+
+%{_mingw_libdir}/libgettextsrc.dll.a
+%{_mingw_libdir}/libgettextsrc.la
+
+%{_mingw_libdir}/libintl.a
+%{_mingw_libdir}/libintl.dll.a
+%{_mingw_libdir}/libintl.la
+
+%{_mingw_docdir}/gettext
+%{_mingw_docdir}/libasprintf/autosprintf_all.html
+
+%{_mingw_datadir}/emacs/site-lisp/*
+
+%{_mingw_datadir}/gettext/
+
+%{_mingw_datadir}/aclocal/*m4
+%{_mingw_datadir}/info/autosprintf.info
+%{_mingw_datadir}/info/gettext.info
+
+%{_mingw_datadir}/locale/*/LC_MESSAGES/gettext-tools.mo
+%{_mingw_datadir}/locale/*/LC_MESSAGES/gettext-runtime.mo
+
+%{_mingw_mandir}/man1/autopoint.1*
+%{_mingw_mandir}/man1/envsubst.1*
+%{_mingw_mandir}/man1/gettext.1*
+%{_mingw_mandir}/man1/gettextize.1*
+%{_mingw_mandir}/man1/msg*1*
+%{_mingw_mandir}/man1/ngettext.1*
+%{_mingw_mandir}/man1/recode-sr-latin.1*
+%{_mingw_mandir}/man1/xgettext.1*
+
+%{_mingw_mandir}/man3/bind_textdomain_codeset.3*
+%{_mingw_mandir}/man3/bindtextdomain.3*
+%{_mingw_mandir}/man3/dcgettext.3*
+%{_mingw_mandir}/man3/dcngettext.3*
+%{_mingw_mandir}/man3/dgettext.3*
+%{_mingw_mandir}/man3/dngettext.3*
+%{_mingw_mandir}/man3/gettext.3*
+%{_mingw_mandir}/man3/ngettext.3*
+%{_mingw_mandir}/man3/textdomain.3*
 
 
 %changelog
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
+- Use RPM macros from mingw-filesystem.
+
 * Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.17-1
 - Initial RPM release, largely based on earlier work from several sources.