SPECS: crossmingw32-libiconv.spec - cleanup, separated -static

[qboosh]

Author: qboosh                       Date: Mon Mar  5 21:32:08 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, separated -static

---- Files affected:
SPECS:
   crossmingw32-libiconv.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-libiconv.spec
diff -u SPECS/crossmingw32-libiconv.spec:1.15 SPECS/crossmingw32-libiconv.spec:1.16
--- SPECS/crossmingw32-libiconv.spec:1.15	Sun Feb 25 16:00:00 2007
+++ SPECS/crossmingw32-libiconv.spec	Mon Mar  5 22:32:01 2007
@@ -6,7 +6,7 @@
 Version:	1.11
 Release:	1
 License:	LGPL
-Group:		Libraries
+Group:		Development/Libraries
 Source0:	ftp://ftp.gnu.org/gnu/libiconv/%{_realname}-%{version}.tar.gz
 # Source0-md5:	b77a17e4a5a817100ad4b2613935055e
 Patch0:		%{name}.patch
@@ -29,10 +29,11 @@
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
 %define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
-%ifarch alpha sparc sparc64 sparcv9
+%ifnarch alpha sparc sparc64 sparcv9
 %define		optflags	-O2
 %endif
 
@@ -50,16 +51,29 @@
 
 Ten pakiet zawiera wersję skrośną dla mingw32.
 
+%package static
+Summary:	Static iconv libraries (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczne biblioteki iconv (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static iconv libraries (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczne biblioteki iconv (wersja skrośna mingw32).
+
 %package dll
-Summary:	%{_relaname} - DLL library for Windows
-Summary(pl.UTF-8):	%{_relaname} - biblioteka DLL dla Windows
+Summary:	DLL iconv libraries for Windows
+Summary(pl.UTF-8):	Biblioteki DLL iconv dla Windows
 Group:		Applications/Emulators
+Requires:	wine
 
 %description dll
-%{_realname} - DLL library for Windows.
+DLL iconv libraries for Windows.
 
 %description dll -l pl.UTF-8
-%{_realname} - biblioteka DLL dla Windows.
+Biblioteki DLL iconv dla Windows.
 
 %prep
 %setup -q -n %{_realname}-%{version}
@@ -75,32 +89,50 @@
 
 %{__make}
 
-%if 0%{!?debug:1}
-%{target}-strip {,libcharset/}lib/.libs/*.dll
-%{target}-strip -g -R.comment -R.note {,libcharset/}lib/.libs/*.a
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+install -d $RPM_BUILD_ROOT%{_dlldir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install {,libcharset/}lib/.libs/*.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
+# not used on win32
+rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
+# runtime only
+rm -f $RPM_BUILD_ROOT%{_bindir}/iconv
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{doc,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/*
-%{_includedir}/*.h
+%{_libdir}/libcharset.dll.a
+%{_libdir}/libiconv.dll.a
+%{_libdir}/libcharset.la
+%{_libdir}/libiconv.la
+%{_includedir}/iconv.h
+%{_includedir}/libcharset.h
+%{_includedir}/localcharset.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libcharset.a
+%{_libdir}/libiconv.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_bindir}/lib*.dll
-%{_datadir}/wine/windows/system/*
+%{_dlldir}/libcharset-*.dll
+%{_dlldir}/libiconv-*.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -108,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/03/05 21:32:01  qboosh
+- cleanup, separated -static
+
 Revision 1.15  2007/02/25 15:00:00  czarny
 - proper cross handling
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-libiconv.spec?r1=1.15&r2=1.16&f=u