X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=gettext%2Fmingw-gettext.spec;h=243af5f2df876c0219aafb0ee7222abb225f07e4;hb=bfb2581bd208d7f921e65ea388bf6f4f3f90adfb;hp=b8acaa27b6650c3c57d761017aeebfbfae8df85c;hpb=135bdfd1377fb6d9303680c748a734644c940950;p=fedora-mingw.git

diff --git a/gettext/mingw-gettext.spec b/gettext/mingw-gettext.spec
index b8acaa2..243af5f 100644
--- a/gettext/mingw-gettext.spec
+++ b/gettext/mingw-gettext.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-gettext
 Version:   0.17
-Release:   2%{?dist}
+Release:   4%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -13,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
+BuildRequires: mingw-filesystem >= 23
 BuildRequires: mingw-gcc
 BuildRequires: mingw-gcc-c++
 BuildRequires: mingw-binutils
@@ -30,7 +35,8 @@ MinGW Windows Gettext library
   --disable-java \
   --disable-native-java \
   --disable-csharp \
-  --enable-threads=win32
+  --enable-threads=win32 \
+  --without-emacs
 
 make
 
@@ -40,6 +46,13 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/locale/locale.alias
 rm -f $RPM_BUILD_ROOT%{_mingw_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
+
+# Remove static libraries.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libasprintf.a
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgettextpo.a
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libintl.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,29 +80,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_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
@@ -120,6 +128,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 0.17-4
+- Disable emacs lisp file install
+
+* Thu Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-3
+- Remove static libraries.
+
 * Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
 - Use RPM macros from mingw-filesystem.