- obsolete

[packages/libpng.git] / libpng.spec

diff --git a/libpng.spec b/libpng.spec
index aecf113dbdc69aa3bf201f598c684d536e74390f..9c9074ea18e7cfe9933d676551c0ff65001f9ef4 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,4 +1,6 @@
-%define _pre beta2
+#
+%define                _pre    rc1
+#
 Summary:       PNG library
 Summary(de):   PNG-Library
 Summary(es):   Biblioteca PNG
@@ -12,17 +14,22 @@ Release:    0.%{_pre}.1
 Epoch:         2
 License:       distributable
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/libpng/%{name}-%{version}%{_pre}.tar.bz2
-# Source0-md5: 45c811627b6fe4d37ec191b4548da949
+Source0:       http://heanet.dl.sourceforge.net/libpng/%{name}-%{version}%{_pre}.tar.bz2
+# Source0-md5: 346bd648912e31fd4ff900b25979f5f2
 Patch0:                %{name}-pngminus.patch
 Patch1:                %{name}-badchunks.patch
 Patch2:                %{name}-opt.patch
 Patch3:                %{name}-revert.patch
-Patch4:                %{name}-16bit-overflow.patch
 Patch5:                %{name}-norpath.patch
+Patch6:                %{name}-libdirfix.patch
+Patch8:                %{name}-pngerror.patch
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: zlib-devel
+%ifarch amd64 ia64 ppc64 sparc64
+Provides:      libpng.so.3()(64bit)
+%else
 Provides:      libpng.so.3
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -70,7 +77,7 @@ Summary(pl):  Pliki nag
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas estáticas
 Summary(tr):   baþlýk dosyalarý ve statik kitaplýklar
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      zlib-devel
 Conflicts:     libpng < 1.0.15
 
@@ -108,7 +115,7 @@ Summary(de):        Statischen PNG Libraries
 Summary(pl):   Biblioteki statyczne PNG
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com libpng
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static PNG libraries.
@@ -140,8 +147,9 @@ Narz
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
+%patch6 -p1
+#%patch8 -p1
 
 %ifarch %{ix86}
 ln -sf scripts/makefile.gcmmx ./Makefile
@@ -152,8 +160,12 @@ ln -sf scripts/makefile.linux ./Makefile
 %build
 %{__make} \
        prefix=%{_prefix} \
+       LIBPATH=%{_libdir} \
+       CC="%{__cc}" \
        OPT_FLAGS="%{rpmcflags}"
 %{__make} -C contrib/pngminus -f makefile.std \
+       LIBPATH=%{_libdir} \
+       CC="%{__cc}" \
        OPT_FLAGS="%{rpmcflags}"
 
 %install
@@ -164,6 +176,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}/man{3,5}} \
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        prefix=%{_prefix} \
+       LIBPATH=%{_libdir} \
        MANPATH=%{_mandir}
 
 install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}