- rel 2; use am/ac

[packages/libpng.git] / libpng.spec

diff --git a/libpng.spec b/libpng.spec
index 66959b84bb08ec14f254e39992c2953c5ddd1f10..3140a73107cf101bb463ab2b0bfe8be49213b68d 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,34 +1,35 @@
-# NOTE: try to switch to ac/am/lt build on 1.2.x->1.4.x upgrade
 Summary:       PNG library
-Summary(de.UTF-8):   PNG-Library
-Summary(es.UTF-8):   Biblioteca PNG
-Summary(fr.UTF-8):   Librarie PNG
-Summary(pl.UTF-8):   Biblioteka PNG
-Summary(pt_BR.UTF-8):   Biblioteca PNG
-Summary(tr.UTF-8):   PNG kitaplığı
+Summary(de.UTF-8):     PNG-Library
+Summary(es.UTF-8):     Biblioteca PNG
+Summary(fr.UTF-8):     Librarie PNG
+Summary(pl.UTF-8):     Biblioteka PNG
+Summary(pt_BR.UTF-8):  Biblioteca PNG
+Summary(tr.UTF-8):     PNG kitaplığı
 Name:          libpng
-Version:       1.2.16
-Release:       1
+Version:       1.2.42
+Release:       2
 Epoch:         2
 License:       distributable
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/libpng/%{name}-%{version}.tar.bz2
-# Source0-md5: 7a1ca4f49bcffdec60d50f48460642bd
+Source0:       http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
+# Source0-md5: dcf4892946e2d6aab6e46d02ed774315
 Patch0:                %{name}-pngminus.patch
 Patch1:                %{name}-opt.patch
 Patch2:                %{name}-norpath.patch
-Patch3:                %{name}-libdirfix.patch
-Patch4:                %{name}-gcc-pch.patch
-Patch5:                %{name}-export_old.patch
-Patch6:                %{name}-revert.patch
+Patch3:                %{name}-export_old.patch
+Patch4:                %{name}-revert.patch
+# http://littlesvr.ca/apng/
+Patch5:                %{name}-apng.patch
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: xz >= 1:4.999.7
 BuildRequires: zlib-devel
 %ifarch %{x8664} ia64 ppc64 s390x sparc64
 Provides:      libpng.so.3()(64bit)
 %else
 Provides:      libpng.so.3
 %endif
+Provides:      libpng(APNG) = 0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -69,15 +70,16 @@ bir resim formatıdır.
 
 %package devel
 Summary:       Header files for libpng
-Summary(de.UTF-8):   libpng Headers
-Summary(es.UTF-8):   Archivos de inclusión y bibliotecas estáticas
-Summary(fr.UTF-8):   en-têtes et bibliothèques statiques
-Summary(pl.UTF-8):   Pliki nagłówkowe libpng
-Summary(pt_BR.UTF-8):   Arquivos de inclusão e bibliotecas estáticas
-Summary(tr.UTF-8):   başlık dosyaları ve statik kitaplıklar
+Summary(de.UTF-8):     libpng Headers
+Summary(es.UTF-8):     Archivos de inclusión y bibliotecas estáticas
+Summary(fr.UTF-8):     en-têtes et bibliothèques statiques
+Summary(pl.UTF-8):     Pliki nagłówkowe libpng
+Summary(pt_BR.UTF-8):  Arquivos de inclusão e bibliotecas estáticas
+Summary(tr.UTF-8):     başlık dosyaları ve statik kitaplıklar
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      zlib-devel
+Provides:      libpng(APNG)-devel = 0.10
 Conflicts:     libpng < 1.0.15
 
 %description devel
@@ -110,11 +112,12 @@ kitaplıklar ve başlık dosyaları.
 
 %package static
 Summary:       Static PNG libraries
-Summary(de.UTF-8):   Statischen PNG Libraries
-Summary(pl.UTF-8):   Biblioteki statyczne PNG
-Summary(pt_BR.UTF-8):   Bibliotecas estáticas para desenvolvimento com libpng
+Summary(de.UTF-8):     Statischen PNG Libraries
+Summary(pl.UTF-8):     Biblioteki statyczne PNG
+Summary(pt_BR.UTF-8):  Bibliotecas estáticas para desenvolvimento com libpng
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Provides:      libpng(APNG)-static = 0.10
 
 %description static
 Static PNG libraries.
@@ -130,8 +133,9 @@ Bibliotecas estáticas para desenvolvimento com libpng.
 
 %package progs
 Summary:       libpng utility programs
-Summary(pl.UTF-8):   Narzędzia do plików PNG
+Summary(pl.UTF-8):     Narzędzia do plików PNG
 Group:         Applications/Graphics
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description progs
 This package contains utility programs to convert PNG files to and
@@ -141,31 +145,18 @@ from PNM files.
 Narzędzia do konwersji plików PNG z lub do plików PNM.
 
 %prep
-%setup -q
+%setup -q -c -T
+xzcat -dc %{SOURCE0} | tar xf - -C ..
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-
-%ifarch %{ix86}
-ln -sf scripts/makefile.gcmmx ./Makefile
-%else
-ln -sf scripts/makefile.linux ./Makefile
-%endif
+%patch5 -p0
 
 %build
-%{__make} \
-       prefix=%{_prefix} \
-       LIBPATH=%{_libdir} \
-       CC="%{__cc}" \
-%ifarch %{x8664}
-       OPT_FLAGS="%{rpmcflags} -DPNG_NO_MMX_CODE"
-%else
-       OPT_FLAGS="%{rpmcflags}"
-%endif
+%configure
+%{__make}
 
 %{__make} -C contrib/pngminus -f makefile.std \
        LIBPATH=%{_libdir} \
@@ -178,11 +169,9 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}/man{3,5}} \
        $RPM_BUILD_ROOT{%{_pkgconfigdir},%{_examplesdir}/%{name}-%{version}}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       prefix=%{_prefix} \
-       LIBPATH=%{_libdir} \
-       MANPATH=%{_mandir}
+       DESTDIR=$RPM_BUILD_ROOT
 
+ln -s libpng12 $RPM_BUILD_ROOT%{_includedir}/libpng
 install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
 install example.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}