Fix the changelog entry numbering.

[fedora-mingw.git] / iconv / mingw32-iconv.spec

diff --git a/iconv/mingw32-iconv.spec b/iconv/mingw32-iconv.spec
index c14edc5..7ad0d73 100644 (file)
--- a/iconv/mingw32-iconv.spec
+++ b/iconv/mingw32-iconv.spec
@@ -6,8 +6,8 @@
 
 Name:      mingw32-iconv
 Version:   1.12
-Release:   4%{?dist}
-Summary:   GNU libraries and utilities for producing multi-lingual messages
+Release:   7%{?dist}
+Summary:   GNU libraries and utilities for character set conversion
 
 License:   GPLv2+ and LGPLv2+
 Group:     Development/Libraries
@@ -20,6 +20,12 @@ BuildRequires: mingw32-filesystem >= 23
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 
+# There's a quasi-circular dependency between mingw32-iconv and
+# mingw32-gettext.  If gettext is installed when you build this then
+# iconv will create *.mo files.  When this package is added to Fedora
+# we can consider adding this circular dep:
+#BuildRequires: mingw32-gettext
+
 
 %description
 MinGW Windows Iconv library
@@ -44,6 +50,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libiconv/
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
+# If mingw32-gettext was installed during the build, remove the *.mo
+# files.  If mingw32-gettext wasn't installed then there won't be any.
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/locale
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc COPYING COPYING.LIB
 %{_mingw32_bindir}/iconv
 %{_mingw32_bindir}/libcharset-1.dll
 %{_mingw32_bindir}/libiconv-2.dll
@@ -66,6 +77,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Dec 19 2008 Richard W.M. Jones <rjones@redhat.com> - 1.12-7
+- Include the license files in doc section.
+- Fix the changelog entry numbering.
+
+* Mon Nov  3 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-5
+- Changed the summary (Bruno Haible).
+- Note about mingw32-gettext / Remove *.mo files.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.17-4
 - Rename mingw -> mingw32.