- added jasper patch (don't use internal functions or hacks)

[packages/xv.git] / xv.spec

diff --git a/xv.spec b/xv.spec
index d03357aa0b8135df62eaf63e3f3b9ebae95ccb6b..c2bb97c99b3afdc115d0829d78357be6adc500ff 100644 (file)
--- a/xv.spec
+++ b/xv.spec
@@ -9,7 +9,7 @@ Summary(tr.UTF-8):      X tabanlı resim görüntüleyici
 Summary(uk.UTF-8):     Програма для перегляду та перетворення файлів зображень для X
 Name:          xv
 Version:       3.10a
-Release:       42
+Release:       43
 License:       Shareware
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.cis.upenn.edu/pub/xv/%{name}-%{version}.tar.gz
@@ -30,10 +30,11 @@ Patch1:             %{name}-3.10a-enhancements.20070520-20081216.diff
 Patch2:                %{name}-libpng-1.5.patch
 Patch3:                %{name}-buffer_overflows.patch
 Patch4:                %{name}-format.patch
+Patch5:                %{name}-jasper.patch
 URL:           http://www.trilon.com/xv/xv.html
 BuildRequires: jasper-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 2:1.2
 BuildRequires: libtiff-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXt-devel
@@ -111,11 +112,12 @@ patch -p1 < ./xv-3.10a-jumbo-fix-enh-patch-20070520.txt || exit 1
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__make} \
        CC="%{__cc}" \
-       CCOPTS="%{rpmcppflags} %{rpmcflags} `pkg-config --cflags libpng12 2>/dev/null`" \
+       CCOPTS="%{rpmcppflags} %{rpmcflags} `pkg-config --cflags libpng 2>/dev/null`" \
        LDFLAGS="%{rpmldflags}"
 
 %install