SPECS: crossmingw32-libpng.spec - cleanup, separated -static, rest...

[qboosh]

Author: qboosh                       Date: Tue Mar  6 20:38:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, separated -static, restored -dll

---- Files affected:
SPECS:
   crossmingw32-libpng.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-libpng.spec
diff -u SPECS/crossmingw32-libpng.spec:1.17 SPECS/crossmingw32-libpng.spec:1.18
--- SPECS/crossmingw32-libpng.spec:1.17	Sun Feb 25 16:03:54 2007
+++ SPECS/crossmingw32-libpng.spec	Tue Mar  6 21:38:45 2007
@@ -6,7 +6,7 @@
 Version:	1.2.16
 Release:	1
 License:	distributable
-Group:		Libraries
+Group:		Development/Libraries
 Source0:	http://dl.sourceforge.net/libpng/%{realname}-%{version}.tar.bz2
 # Source0-md5:	7a1ca4f49bcffdec60d50f48460642bd
 Patch0:		%{realname}-pngminus.patch
@@ -17,7 +17,6 @@
 Patch5:		%{name}-shared.patch
 URL:		http://www.libpng.org/pub/png/libpng.html
 BuildRequires:	crossmingw32-gcc
-BuildRequires:	crossmingw32-w32api
 BuildRequires:	crossmingw32-zlib
 Requires:	crossmingw32-zlib
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,12 +26,11 @@
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
 %define		arch			%{_prefix}/%{target}
-%define		gccarch			%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib			%{_prefix}/lib/gcc-lib/%{target}/%{version}
 
 %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++
 
@@ -45,21 +43,39 @@
 manipulate PNG format graphics files. The PNG format was designed as a
 replacement for GIF, with many improvements and extensions.
 
+This package contains the cross version for Win32.
+
 %description -l pl.UTF-8
 Biblioteki PNG są kolekcją form używanych do tworzenia i manipulowania
 plikami w formacie graficznym PNG. Format ten został stworzony jako
 zamiennik dla formatu GIF, z wieloma rozszerzeniami i nowościami.
 
-#%package dll
-#Summary:	libpng - DLL library for Windows
-#Summary(pl.UTF-8):	libpng - biblioteka DLL dla Windows
-#Group:		Applications/Emulators
-#
-#%description dll
-#libpng - DLL library for Windows.
-#
-#%description dll -l pl.UTF-8
-#libpng - biblioteka DLL dla Windows.
+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package static
+Summary:	Static libpng library (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka libpng (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static libpng library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libpng (wersja skrośna mingw32).
+
+%package dll
+Summary:	libpng - DLL library for Windows
+Summary(pl.UTF-8):	libpng - biblioteka DLL dla Windows
+Group:		Applications/Emulators
+Requires:	crossmingw32-zlib-dll
+Requires:	wine
+
+%description dll
+libpng - DLL library for Windows.
+
+%description dll -l pl.UTF-8
+libpng - biblioteka DLL dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
@@ -68,19 +84,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
-ln -sf scripts/makefile.gcmmx ./Makefile
-
 %patch5 -p1
 
 %build
-#%{__make} \
-#	prefix=%{_arch} \
-#	LIBPATH=%{_arch}/lib \
-#	CC="%{target}-gcc" \
-#	RANLIB="%{target}-ranlib" \
-#	OPT_FLAGS="%{rpmcflags}" \
-#	LDFLAGS="-static %{rpmldflags}"
 %configure \
 	--target=%{target} \
 	--host=%{target} \
@@ -88,37 +94,44 @@
 
 %{__make}
 
-%if 0%{!?debug:1}
-%{target}-strip -R.comment -R.note .libs/*.dll
-%{target}-strip -g -R.comment -R.note .libs/*.a
-%endif
-
 %install
-#rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
-# install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-#
-#install *.a $RPM_BUILD_ROOT%{arch}/lib
-#install png.h pngconf.h $RPM_BUILD_ROOT%{arch}/include
-#install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/man
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_libdir}/libpng.dll.a
+%{_libdir}/libpng12.dll.a
+%{_libdir}/libpng.la
+%{_libdir}/libpng12.la
 %dir %{_includedir}/libpng12
 %{_includedir}/libpng12/*
-%{_libdir}/*.la
-%{_libdir}/*.a
-%{_bindir}/*.dll
 %{_pkgconfigdir}/*.pc
 
-#%files dll
-#%defattr(644,root,root,755)
-#%{_datadir}/wine/windows/system/*.dll
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libpng.a
+%{_libdir}/libpng12.a
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libpng-*.dll
+%{_dlldir}/libpng12-*.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -126,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/03/06 20:38:45  qboosh
+- cleanup, separated -static, restored -dll
+
 Revision 1.17  2007/02/25 15:03:54  czarny
 - shared + static build
 - configure used for .la and .pc files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-libpng.spec?r1=1.17&r2=1.18&f=u