- updated to 2.08

- updated URLs
- updated config noforce patch
- removed obsolete libpng-1.4 patch
- added webp bcond

Changed files:
    fbida-config-noforce.patch -> 1.2
    fbida-libpng-1.4.patch -> 1.2
    fbida.spec -> 1.19

diff --git a/fbida-config-noforce.patch b/fbida-config-noforce.patch
index 25ba0755dbf84bb7922a8e413efe9bfbbb2f0d6f..a3a1f7f60bbe285f559ad09ac73046f65f91e660 100644 (file)
--- a/fbida-config-noforce.patch
+++ b/fbida-config-noforce.patch
@@ -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)

diff --git a/fbida-libpng-1.4.patch b/fbida-libpng-1.4.patch
deleted file mode 100644 (file)
index 2899140..0000000
--- a/fbida-libpng-1.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fbida-2.07/rd/read-png.c.old       2010-01-31 09:53:29.000000000 +0100
-+++ fbida-2.07/rd/read-png.c   2010-01-31 09:55:03.000000000 +0100
-@@ -69,7 +69,7 @@ png_init(FILE *fp, char *filename, unsig
-     if (h->color_type == PNG_COLOR_TYPE_PALETTE)
-       png_set_palette_to_rgb(h->png);
-     if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
--      png_set_gray_1_2_4_to_8(h->png);
-+      png_set_expand_gray_1_2_4_to_8(h->png);
- 
-     if (png_get_bKGD(h->png, h->info, &file_bg)) {
-       png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0);

diff --git a/fbida.spec b/fbida.spec
index 82d63d018b7f8e663c7ade3e242d802c9b744130..ff3a4494eb4aa4c5c98d788b52b41f47cbbc2fe8 100644 (file)
--- a/fbida.spec
+++ b/fbida.spec
@@ -11,6 +11,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
@@ -19,16 +20,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
@@ -41,6 +41,7 @@ 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}
@@ -123,7 +124,6 @@ Dostępne jest też trochę podstawowych funkcji edycyjnych.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 CFLAGS="%{rpmcflags}" \
@@ -134,6 +134,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 +151,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} \