- cleanup, separated -static, restored -dll

Changed files:
    crossmingw32-libpng.spec -> 1.18

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index e201d30473167f0176011a1417d101c833478fc8..87ef2c341d437d338aabed7cfeed49665d79068f 100644 (file)
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -5,7 +5,7 @@ Name:           crossmingw32-%{realname}
 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
@@ -16,7 +16,6 @@ Patch4:               %{realname}-libdirfix.patch
 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)
@@ -26,12 +25,11 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %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++
 
@@ -44,21 +42,39 @@ The PNG library is a collection of routines used to create and
 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}
@@ -67,19 +83,9 @@ zamiennik dla formatu GIF, z wieloma rozszerzeniami i nowościami.
 %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} \
@@ -87,34 +93,41 @@ ln -sf scripts/makefile.gcmmx ./Makefile
 
 %{__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