X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=iconv%2Fmingw-iconv.spec;h=88bb2add83503529cad4e5d8955676fa4eb9ae81;hb=8e6f1295d0f6b1fc41367e700811dd05f638ab83;hp=c173597f0e561d520868953b6d013c472107d707;hpb=c86e2013820bddff95604dd831549acc08b66f09;p=fedora-mingw.git

diff --git a/iconv/mingw-iconv.spec b/iconv/mingw-iconv.spec
index c173597..88bb2ad 100644
--- a/iconv/mingw-iconv.spec
+++ b/iconv/mingw-iconv.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-iconv
 Version:   1.12
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -12,7 +16,7 @@ Source0:   http://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz
 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
 
@@ -20,21 +24,31 @@ BuildRequires: mingw-binutils
 %description
 MinGW Windows Iconv library
 
+
 %prep
 %setup -q -n libiconv-%{version}
 
+
 %build
 %{_mingw_configure}
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# Remove documentation which duplicates what is already in
+# Fedora native packages.
+rm -rf $RPM_BUILD_ROOT%{_mingw_docdir}/libiconv/
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
 %{_mingw_bindir}/iconv
@@ -49,15 +63,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_libdir}/libcharset.la
 %{_mingw_libdir}/libiconv.dll.a
 %{_mingw_libdir}/libiconv.la
-%{_mingw_docdir}/libiconv/
-%{_mingw_mandir}/man1/iconv.1*
-%{_mingw_mandir}/man3/iconv.3*
-%{_mingw_mandir}/man3/iconv_close.3*
-%{_mingw_mandir}/man3/iconv_open.3*
-%{_mingw_mandir}/man3/iconvctl.3*
 
 
 %changelog
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-3
+- Remove documentation which duplicates what is in Fedora native packages.
+
 * Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-2
 - Use RPM macros from mingw-filesystem.