From b99f11c5def3968d5b3d9a9c777a6ab6c5f841d9 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Wed, 27 Dec 2017 18:42:21 +0100
Subject: [PATCH] updated to 2.14

---
 .gitignore |  1 +
 fbida.spec | 73 ++++++++++++++++++++++++++++++++++++++----------------
 sources    |  2 +-
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index d90b408..489fa60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 fbida-2.07.tar.gz
 /fbida-2.09.tar.gz
+/fbida-2.14.tar.gz
diff --git a/fbida.spec b/fbida.spec
index 6881eef..36bc65f 100644
--- a/fbida.spec
+++ b/fbida.spec
@@ -1,18 +1,27 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
-Version:        2.09
-Release:        13%{?dist}
+Version:        2.14
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
-URL:            http://linux.bytesex.org/fbida/
-Source:         http://dl.bytesex.org/releases/fbida/fbida-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            https://www.kraxel.org/blog/linux/fbida/
+Source:         https://www.kraxel.org/releases/fbida/fbida-%{version}.tar.gz
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
 BuildRequires:  giflib-devel curl-devel
 BuildRequires:  libXpm-devel
+BuildRequires:  mesa-libgbm-devel
+BuildRequires:  mesa-libEGL-devel
+BuildRequires:  motif-devel
+BuildRequires:  poppler-glib-devel
+BuildRequires:  libepoxy-devel
+BuildRequires:  pixman-devel
+BuildRequires:  freetype-devel
+BuildRequires:  libdrm-devel
+BuildRequires:  lirc-devel
+BuildRequires:  libwebp-devel
+BuildRequires:  perl-generators
 Requires:       ImageMagick dejavu-sans-mono-fonts
-Obsoletes:      fbida-ida < 2.06-1
 
 %description
 fbi displays the specified file(s) on the linux console using the
@@ -28,29 +37,38 @@ Requires: ghostscript fbida
 %description fbgs
 A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
 
+%package fbpdf
+Group: Applications/Multimedia
+Summary: Framebuffer PDF Viewer
+
+%description fbpdf
+fbpdf displays PDF files on the framebuffer device.
+
+%package ida
+Group: Applications/Multimedia
+Summary: Motif based Imageviewer
+
+%description ida
+This is a X11 application (Motif based) for viewing images. Some basic
+editing functions are available too.
+
 %prep
 %setup -q
-%{__sed} -i -e "s,/X11R6,,g" GNUmakefile
-%{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
 
 %build
-LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags} HAVE_MOTIF=no exiftran thumbnail.cgi fbi
+LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags} all
 
 %install
-%{__rm} -rf %{buildroot}
-iconv -t UTF-8 -f ISO-8859-1 fbi.man > fbi.man.new
-iconv -t UTF-8 -f ISO-8859-1 exiftran.man > exiftran.man.new
-iconv -t UTF-8 -f ISO-8859-1 fbgs.man > fbgs.man.new
-%{__mv} fbi.man.new fbi.man
-%{__mv} exiftran.man.new exiftran.man
-%{__mv} fbgs.man.new fbgs.man
+cd man
+for man in fbi exiftran fbgs ida; do
+    iconv -t UTF-8 -f ISO-8859-1 $man.1 > $man.new
+    %{__mv} $man.new fbi.1
+done
+cd ..
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} STRIP= install
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
-%defattr(-, root, root, 0755)
+%license COPYING
 %doc Changes COPYING README TODO
 %doc %{_mandir}/man1/fbi*
 %doc %{_mandir}/man1/exiftran*
@@ -58,11 +76,24 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} STRIP= install
 %{_bindir}/exiftran
 
 %files fbgs
-%defattr(-, root, root, -)
+%license COPYING
 %doc %{_mandir}/man1/fbgs*
 %{_bindir}/fbgs
 
+%files fbpdf
+%license COPYING
+%{_bindir}/fbpdf
+
+%files ida
+%license COPYING
+%doc %{_mandir}/man1/ida*
+%{_bindir}/ida
+%{_datadir}/X11/app-defaults/Ida
+
 %changelog
+* Wed Dec 27 2017 Adrian Reber <adrian@lisas.de> - 2.14-1
+- updated to 2.14
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.09-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index a0ad0f5..5689f05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62415c7cb28d995f9d317868de0f2830  fbida-2.09.tar.gz
+SHA512 (fbida-2.14.tar.gz) = 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec