X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fbida.spec;h=0d43c31829d7da4721b49722fd303c506ad44fac;hb=0ee28e449b8727e508469e7a3db78056bdc53171;hp=82d63d018b7f8e663c7ade3e242d802c9b744130;hpb=d942d069b7292e4b33ed018459ac80b961993a49;p=packages%2Ffbida.git

diff --git a/fbida.spec b/fbida.spec
index 82d63d0..0d43c31 100644
--- a/fbida.spec
+++ b/fbida.spec
@@ -11,24 +11,26 @@
 %bcond_without	png	# without PNG images support
 %bcond_without	sane	# without SANE scanning support (in ida)
 %bcond_without	tiff	# without TIFF images support
-#
-%if !%{with motif}
+%bcond_without	webp	# without WebP images support
+
+%if %{without motif}
 # SANE used only in ida
 %undefine	with_sane
 %endif
 Summary:	fbida - a few applications for viewing and editing images
 Summary(pl.UTF-8):	fbida - kilka aplikacji do oglądania i edycji obrazków
 Name:		fbida
-Version:	2.07
-Release:	2
+Version:	2.09
+Release:	13
 License:	GPL
 Group:		Applications/Graphics
-Source0:	http://dl.bytesex.org/releases/fbida/%{name}-%{version}.tar.gz
-# Source0-md5:	3e05910fb7c1d9b2bd3e272d96db069c
+Source0:	http://www.kraxel.org/releases/fbida/%{name}-%{version}.tar.gz
+# Source0-md5:	62415c7cb28d995f9d317868de0f2830
 Patch0:		%{name}-config-noforce.patch
 Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-libpng-1.4.patch
-URL:		http://linux.bytesex.org/fbida/
+Patch2:		format-security.patch
+Patch3:		%{name}-giflib.patch
+URL:		http://www.kraxel.org/blog/linux/fbida/
 BuildRequires:	ImageMagick-devel
 %{?with_curl:BuildRequires:	curl-devel}
 BuildRequires:	fontconfig-devel
@@ -41,9 +43,10 @@ BuildRequires:	libjpeg-devel
 %{?with_pcd:BuildRequires:	libpcd-devel >= 1:1.0.1}
 %{?with_png:BuildRequires:	libpng-devel}
 %{?with_tiff:BuildRequires:	libtiff-devel}
+%{?with_webp:BuildRequires:	libwebp-devel}
 %{?with_lirc:BuildRequires:	lirc-devel}
 # acc. to README lesstif is not sufficient
-%{?with_motif:BuildRequires:	openmotif-devel >= 2.0}
+%{?with_motif:BuildRequires:	motif-devel >= 2.0}
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 %{?with_sane:BuildRequires:	sane-backends-devel}
@@ -124,6 +127,7 @@ Dostępne jest też trochę podstawowych funkcji edycyjnych.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 CFLAGS="%{rpmcflags}" \
@@ -134,6 +138,7 @@ CFLAGS="%{rpmcflags}" \
 	%{!?with_gif:HAVE_LIBUNGIF=no} \
 	%{!?with_png:HAVE_LIBPNG=no} \
 	%{!?with_tiff:HAVE_LIBTIFF=no} \
+	%{!?with_webp:HAVE_LIBWEBP=no} \
 	%{!?with_sane:HAVE_LIBSANE=no} \
 	%{!?with_curl:HAVE_LIBCURL=no} \
 	%{!?with_lirc:HAVE_LIBLIRC=no} \
@@ -150,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 	%{!?with_gif:HAVE_LIBUNGIF=no} \
 	%{!?with_png:HAVE_LIBPNG=no} \
 	%{!?with_tiff:HAVE_LIBTIFF=no} \
+	%{!?with_webp:HAVE_LIBWEBP=no} \
 	%{!?with_sane:HAVE_LIBSANE=no} \
 	%{!?with_curl:HAVE_LIBCURL=no} \
 	%{!?with_lirc:HAVE_LIBLIRC=no} \