[packages/fbida] - updated to 2.12 - updated config-noforce patch - new fbpdf program in separate package because of

[qboosh]

commit 83bf87421a994d48b2c4c0891003a1f6a3925325
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 24 13:03:08 2016 +0200

    - updated to 2.12
    - updated config-noforce patch
    - new fbpdf program in separate package because of dependencies (libgbm, cairo, epoxy, poppler)

 fbida-config-noforce.patch | 20 +++++++++-----------
 fbida.spec                 | 24 ++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/fbida.spec b/fbida.spec
index 97e1111..f84811b 100644
--- a/fbida.spec
+++ b/fbida.spec
@@ -20,17 +20,19 @@
 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.11
+Version:	2.12
 Release:	1
 License:	GPL
 Group:		Applications/Graphics
 Source0:	https://www.kraxel.org/releases/fbida/%{name}-%{version}.tar.gz
-# Source0-md5:	7b676aecc59961ac1e78b33649f6a386
+# Source0-md5:	f5f3fdaca387f267ddc8a05365113448
 Patch0:		%{name}-config-noforce.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		format-security.patch
 URL:		https://www.kraxel.org/blog/linux/fbida/
 BuildRequires:	ImageMagick-devel
+BuildRequires:	Mesa-libgbm-devel
+BuildRequires:	cairo-devel
 %{?with_curl:BuildRequires:	curl-devel}
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2.0.0
@@ -38,6 +40,7 @@ BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	gcc >= 5:4.0
 %{?with_gif:BuildRequires:	giflib-devel}
 BuildRequires:	libdrm-devel
+BuildRequires:	libepoxy-devel
 BuildRequires:	libexif-devel >= 1:0.6.9
 BuildRequires:	libjpeg-devel
 %{?with_pcd:BuildRequires:	libpcd-devel >= 1:1.0.1}
@@ -49,6 +52,8 @@ BuildRequires:	libjpeg-devel
 %{?with_motif:BuildRequires:	motif-devel >= 2.0}
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig(cairo-gl)
+BuildRequires:	poppler-glib-devel
 %{?with_sane:BuildRequires:	sane-backends-devel}
 BuildRequires:	util-linux
 BuildRequires:	which
@@ -107,6 +112,17 @@ Ten pakiet zawiera także dodatkowe narzędzia:
 - exiftran - działające z linii poleceń narzędzie do wykonywania
   bezstratnych przekształceń obrazków JPEG
 
+%package -n fbpdf
+Summary:	Linux FrameBuffer PDF viewer
+Summary(pl.UTF-8):	Przeglądarka plików PDF dla linuksowego framebuffera
+Group:		Applications/Graphics
+
+%description -n fbpdf
+Linux FrameBuffer PDF viewer.
+
+%description -n fbpdf -l pl.UTF-8
+Przeglądarka plików PDF dla linuksowego framebuffera.
+
 %package -n ida
 Summary:	Small and fast image viewer, Motif-based
 Summary(pl.UTF-8):	Mała, szybka przeglądarka obrazków oparta na Motifie
@@ -176,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/fbgs.1*
 %{_mandir}/man1/fbi.1*
 
+%files -n fbpdf
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fbpdf
+
 %if %{with motif}
 %files -n ida
 %defattr(644,root,root,755)
diff --git a/fbida-config-noforce.patch b/fbida-config-noforce.patch
index 60a2e2e..e06cb96 100644
--- a/fbida-config-noforce.patch
+++ b/fbida-config-noforce.patch
@@ -1,25 +1,23 @@
---- fbida-2.10/GNUmakefile.orig	2015-05-09 10:47:54.960989289 +0200
-+++ fbida-2.10/GNUmakefile	2015-05-09 11:09:58.194267091 +0200
-@@ -42,16 +42,16 @@
+--- fbida-2.12/GNUmakefile.orig	2016-04-23 23:13:37.947221742 +0200
++++ fbida-2.12/GNUmakefile	2016-04-23 23:18:37.660542503 +0200
+@@ -65,15 +65,15 @@
  HAVE_NEW_EXIF	:= $(call ac_header,libexif/exif-log.h)
  HAVE_GLIBC	:= $(call ac_func,fopencookie)
  HAVE_STRSIGNAL	:= $(call ac_func,strsignal)
 -HAVE_LIBPCD	:= $(call ac_lib,pcd_open,pcd)
 -HAVE_LIBGIF	:= $(call ac_lib,DGifOpenFileName,gif)
--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_LIBPNG	:= $(call ac_pkg_config,libpng)
+-HAVE_LIBTIFF	:= $(call ac_pkg_config,libtiff-4)
+-HAVE_LIBWEBP	:= $(call ac_pkg_config,libwebp)
 -HAVE_LIBSANE	:= $(call ac_lib,sane_init,sane)
 -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)
 +HAVE_LIBPCD	?= $(call ac_lib,pcd_open,pcd)
 +HAVE_LIBGIF	?= $(call ac_lib,DGifOpenFileName,gif)
-+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_LIBPNG	?= $(call ac_pkg_config,libpng)
++HAVE_LIBTIFF	?= $(call ac_pkg_config,libtiff-4)
++HAVE_LIBWEBP	?= $(call ac_pkg_config,libwebp)
 +HAVE_LIBSANE	?= $(call ac_lib,sane_init,sane)
 +HAVE_LIBCURL	?= $(call ac_lib,curl_easy_init,curl)
 +HAVE_LIBLIRC	?= $(call ac_lib,lirc_init,lirc_client)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fbida.git/commitdiff/83bf87421a994d48b2c4c0891003a1f6a3925325