packages: fbida/fbida-config-noforce.patch, fbida/fbida.spec, fbida/fbida-l...

[qboosh]

Author: qboosh                       Date: Sun Jun  5 06:56:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.08
- updated URLs
- updated config noforce patch
- removed obsolete libpng-1.4 patch
- added webp bcond

---- Files affected:
packages/fbida:
   fbida-config-noforce.patch (1.1 -> 1.2) , fbida.spec (1.18 -> 1.19) , fbida-libpng-1.4.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/fbida/fbida-config-noforce.patch
diff -u packages/fbida/fbida-config-noforce.patch:1.1 packages/fbida/fbida-config-noforce.patch:1.2
--- packages/fbida/fbida-config-noforce.patch:1.1	Mon Oct 25 22:40:45 2004
+++ packages/fbida/fbida-config-noforce.patch	Sun Jun  5 08:56:39 2011
@@ -1,6 +1,6 @@
---- fbida-2.01/GNUmakefile.orig	2004-06-30 15:41:54.000000000 +0200
-+++ fbida-2.01/GNUmakefile	2004-10-25 21:01:59.674755768 +0200
-@@ -35,15 +35,15 @@
+--- fbida-2.08/GNUmakefile.orig	2011-06-01 09:31:59.000000000 +0200
++++ fbida-2.08/GNUmakefile	2011-06-05 08:53:44.957075434 +0200
+@@ -42,16 +42,16 @@
  HAVE_NEW_EXIF	:= $(call ac_header,libexif/exif-log.h)
  HAVE_GLIBC	:= $(call ac_func,fopencookie)
  HAVE_STRCASESTR	:= $(call ac_func,strcasestr)
@@ -8,10 +8,12 @@
 -HAVE_LIBUNGIF	:= $(call ac_lib,DGifOpenFileName,ungif)
 -HAVE_LIBPNG	:= $(call ac_lib,png_read_info,png,-lz)
 -HAVE_LIBTIFF	:= $(call ac_lib,TIFFOpen,tiff)
+-HAVE_LIBWEBP	:= $(call ac_lib,WebPDecodeRGBA,webp)
 +HAVE_LIBPCD	?= $(call ac_lib,pcd_open,pcd)
 +HAVE_LIBUNGIF	?= $(call ac_lib,DGifOpenFileName,ungif)
 +HAVE_LIBPNG	?= $(call ac_lib,png_read_info,png,-lz)
 +HAVE_LIBTIFF	?= $(call ac_lib,TIFFOpen,tiff)
++HAVE_LIBWEBP	?= $(call ac_lib,WebPDecodeRGBA,webp)
  #HAVE_LIBMAGICK	:= $(call ac_binary,Magick-config)
 -HAVE_LIBSANE	:= $(call ac_lib,sane_init,sane)
 -HAVE_LIBCURL	:= $(call ac_lib,curl_easy_init,curl)
@@ -21,6 +23,6 @@
 +HAVE_LIBCURL	?= $(call ac_lib,curl_easy_init,curl)
 +HAVE_LIBLIRC	?= $(call ac_lib,lirc_init,lirc_client)
 +HAVE_MOTIF	?= $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11)
+ JPEG_VER        := $(call ac_jpeg_ver)
  endef
  
- # transparent http/ftp access using curl depends on fopencookie (glibc)

================================================================
Index: packages/fbida/fbida.spec
diff -u packages/fbida/fbida.spec:1.18 packages/fbida/fbida.spec:1.19
--- packages/fbida/fbida.spec:1.18	Fri Feb 11 02:33:24 2011
+++ packages/fbida/fbida.spec	Sun Jun  5 08:56:39 2011
@@ -12,6 +12,7 @@
 %bcond_without	png	# without PNG images support
 %bcond_without	sane	# without SANE scanning support (in ida)
 %bcond_without	tiff	# without TIFF images support
+%bcond_without	webp	# without WebP images support
 #
 %if !%{with motif}
 # SANE used only in ida
@@ -20,16 +21,15 @@
 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.08
+Release:	1
 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:	9b3693ab26a58194e36b479bffb61ed0
 Patch0:		%{name}-config-noforce.patch
 Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-libpng-1.4.patch
-URL:		http://linux.bytesex.org/fbida/
+URL:		http://www.kraxel.org/blog/linux/fbida/
 BuildRequires:	ImageMagick-devel
 %{?with_curl:BuildRequires:	curl-devel}
 BuildRequires:	fontconfig-devel
@@ -42,6 +42,7 @@
 %{?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}
@@ -124,7 +125,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 CFLAGS="%{rpmcflags}" \
@@ -135,6 +135,7 @@
 	%{!?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} \
@@ -151,6 +152,7 @@
 	%{!?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} \
@@ -188,6 +190,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/06/05 06:56:39  qboosh
+- updated to 2.08
+- updated URLs
+- updated config noforce patch
+- removed obsolete libpng-1.4 patch
+- added webp bcond
+
 Revision 1.18  2011/02/11 01:33:24  sparky
 - s/util-linux-ng7util-linux/
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fbida/fbida-config-noforce.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fbida/fbida.spec?r1=1.18&r2=1.19&f=u