- rebuilt

- added patch to fix build failure on ppc/ppc64
- rebuilt
2008-02-15 08:58:56 +00:00 · 2008-02-15 08:07:41 +00:00 · 2007-08-25 16:45:22 +00:00 · 2006-10-31 21:16:08 +00:00 · 2006-09-29 05:49:48 +00:00 · 2006-09-18 10:25:42 +00:00
4 changed files with 38 additions and 24 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fbida-2.05.tar.gz
+fbida-2.06.tar.gz
--- a/fbida-2.06-no-page-h.patch
+++ b/fbida-2.06-no-page-h.patch
@@ -0,0 +1,12 @@
+diff -u fbida-2.06/fbtools.c fbida-2.06.new/fbtools.c
+--- fbida-2.06/fbtools.c	2006-08-14 21:38:05.000000000 +0200
+++ fbida-2.06.new/fbtools.c	2008-02-15 09:54:37.000000000 +0100
+@@ -21,8 +21,6 @@
+ #include <linux/vt.h>
+ #include <linux/fb.h>
+ 
+-#include <asm/page.h>
+-
+ #include "fbtools.h"
+ 
+ /* -------------------------------------------------------------------- */
--- a/fbida.spec
+++ b/fbida.spec
@@ -1,20 +1,21 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
-Version:        2.05
-Release:        1%{?dist}
-License:        GPL
+Version:        2.06
+Release:        5%{?dist}
+License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
-Source:         http://dl.bytesex.org/releases/fbida/fbida-2.05.tar.gz
+Source:         http://dl.bytesex.org/releases/fbida/fbida-%{version}.tar.gz
 Patch0:         fbgs.1.diff
 Patch1:         fbi.1.diff
+Patch2:         fbida-2.06-no-page-h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
 BuildRequires:  libungif-devel curl-devel
-BuildRequires:  openmotif-devel
 BuildRequires:  libXpm-devel
 Requires:       ImageMagick bitstream-vera-fonts
+Obsoletes:      fbida-ida < 2.06-1

 %description
 fbi displays the specified file(s) on the linux console using the
@@ -22,14 +23,6 @@ framebuffer device. PhotoCD, jpeg, ppm, gif, tiff, xwd, bmp and png
 are supported directly. For other formats fbi tries to use
 ImageMagick's convert.

-%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.
-
 %package fbgs
 Group: Applications/Multimedia
 Summary: Framebuffer Postscript Viewer
@@ -42,22 +35,21 @@ A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
 %setup -q
 %patch0
 %patch1
+%patch2 -p1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__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}
+LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags} HAVE_MOTIF=no exiftran thumbnail.cgi fbi

 %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 ida.man > ida.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} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install

@@ -72,18 +64,28 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %{_bindir}/fbi
 %{_bindir}/exiftran

-%files ida
-%defattr(-, root, root, -)
-%doc %{_mandir}/man1/ida*
-%{_bindir}/ida
-%config %{_datadir}/X11/app-defaults/Ida
-
 %files fbgs
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/fbgs*
 %{_bindir}/fbgs

 %changelog
+* Fri Feb 15 2008 Adrian Reber <adrian@lisas.de> - 2.06-5
+- rebuilt
+- added patch to fix build failure on ppc/ppc64
+
+* Sat Aug 25 2007 Adrian Reber <adrian@lisas.de> - 2.06-4
+- rebuilt
+
+* Tue Oct 31 2006 Adrian Reber <adrian@lisas.de> - 2.06-3
+- rebuilt for new curl
+
+* Fri Sep 29 2006 Adrian Reber <adrian@lisas.de> - 2.06-2
+- obsoleted fbida-ida subpackage (#208457)
+
+* Wed Aug 30 2006 Tom "spot" Callaway <tcallawa@redhat.com> - 2.06-1
+- get rid of ida, we can't build a working version without openmotif
+
 * Fri Jul 28 2006 Adrian Reber <adrian@lisas.de> - 2.05-1
 - updated to 2.05
 - dropped fbida.CVE-2006-1695.patch (now included)
--- a/2
+++ b/2
@@ -1 +1 @@
-7a624bb9f08e76c80e79eca2fbbe770d  fbida-2.05.tar.gz
+1f78e9a83fb546660a024a4bc0580ace  fbida-2.06.tar.gz
Author	SHA1	Message	Date
Adrian Reber	9d8876ef6b	- rebuilt - added patch to fix build failure on ppc/ppc64	2008-02-15 08:58:56 +00:00
Adrian Reber	bd315618cd	- rebuilt	2008-02-15 08:07:41 +00:00
Adrian Reber	91aa5decdd	- rebuilt	2007-08-25 16:45:22 +00:00
Adrian Reber	fc114c6bb9	- rebuilt for new curl	2006-10-31 21:16:08 +00:00
Adrian Reber	bd3892ee52	- obsoleted fbida-ida subpackage (#208457 )	2006-09-29 05:49:48 +00:00
Adrian Reber	db891caedd	there were still old files in sources and .cvsignore	2006-09-18 10:25:42 +00:00
Adrian Reber	fa85f66d64	- get rid of ida, we can't build a working version without openmotif	2006-09-18 10:24:57 +00:00
Ville Skyttä	1766b81ca6	http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild	2006-08-27 20:23:03 +00:00