- rel 2; use am/ac

[packages/libpng.git] / libpng.spec

diff --git a/libpng.spec b/libpng.spec
index c5290301f8cb0339db788d5563d767c79d335ff9..3140a73107cf101bb463ab2b0bfe8be49213b68d 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,4 +1,3 @@
-# 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
@@ -7,13 +6,13 @@ Summary(pl.UTF-8):    Biblioteka PNG
 Summary(pt_BR.UTF-8):  Biblioteca PNG
 Summary(tr.UTF-8):     PNG kitaplığı
 Name:          libpng
-Version:       1.2.24
-Release:       3
+Version:       1.2.42
+Release:       2
 Epoch:         2
 License:       distributable
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/libpng/%{name}-%{version}.tar.bz2
-# Source0-md5: 1e676c5cc7dfa4ef78affe8fb8f1011d
+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
@@ -23,6 +22,7 @@ Patch4:               %{name}-revert.patch
 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)
@@ -145,7 +145,8 @@ 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
@@ -153,22 +154,9 @@ Narzędzia do konwersji plików PNG z lub do plików PNM.
 %patch4 -p1
 %patch5 -p0
 
-%ifarch %{ix86}
-ln -sf scripts/makefile.gcmmx ./Makefile
-%else
-ln -sf scripts/makefile.linux ./Makefile
-%endif
-
 %build
-%{__make} \
-       prefix=%{_prefix} \
-       LIBPATH=%{_libdir} \
-       CC="%{__cc}" \
-%ifarch %{x8664} sparc sparcv9 sparc64
-       OPT_FLAGS="%{rpmcflags} -DPNG_NO_MMX_CODE"
-%else
-       OPT_FLAGS="%{rpmcflags}"
-%endif
+%configure
+%{__make}
 
 %{__make} -C contrib/pngminus -f makefile.std \
        LIBPATH=%{_libdir} \
@@ -181,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}