rpms/mingw32-iconv/devel mingw32-iconv.spec,1.4,1.5

[epienbro]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-iconv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27792

Modified Files:
	mingw32-iconv.spec 
Log Message:
* Mon Sep  7 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12-11
- Fixed %defattr line
- Added -static subpackage
- Use %global instead of %define
- Automatically generate debuginfo subpackage



Index: mingw32-iconv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-iconv/devel/mingw32-iconv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-iconv.spec	25 Jul 2009 12:19:48 -0000	1.4
+++ mingw32-iconv.spec	7 Sep 2009 18:07:09 -0000	1.5
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:      mingw32-iconv
 Version:   1.12
-Release:   10%{?dist}
+Release:   11%{?dist}
 Summary:   GNU libraries and utilities for character set conversion
 
 License:   GPLv2+ and LGPLv2+
@@ -16,7 +17,7 @@ Source0:   http://ftp.gnu.org/pub/gnu/li
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 52
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 
@@ -31,12 +32,24 @@ BuildRequires: mingw32-binutils
 MinGW Windows Iconv library
 
 
+%package static
+Summary:        Static version of the MinGW Windows Iconv library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Iconv library.
+
+
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libiconv-%{version}
 
 
 %build
-%{_mingw32_configure}
+%{_mingw32_configure} --enable-static --enable-shared
 make
 
 
@@ -60,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING COPYING.LIB
 %{_mingw32_bindir}/iconv
 %{_mingw32_bindir}/libcharset-1.dll
@@ -69,14 +82,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_includedir}/libcharset.h
 %{_mingw32_includedir}/localcharset.h
 %{_mingw32_libdir}/charset.alias
-%{_mingw32_libdir}/libcharset.a
 %{_mingw32_libdir}/libcharset.dll.a
 %{_mingw32_libdir}/libcharset.la
 %{_mingw32_libdir}/libiconv.dll.a
 %{_mingw32_libdir}/libiconv.la
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcharset.a
+%{_mingw32_libdir}/libiconv.a
+
 
 %changelog
+* Mon Sep  7 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12-11
+- Fixed %%defattr line
+- Added -static subpackage
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild