- rebuilt for new curl

- dropped fbida.CVE-2006-1695.patch (now included)
- dropped fix for #200321 (included in new release)
- added two patches from debian to fix typos in manpages

.cvsignore

@@ -1 +1 @@
-fbida-2.03.tar.gz
+fbida-2.06.tar.gz

fbgs.1.diff

@@ -0,0 +1,14 @@
+--- fbgs.man	2005-05-30 01:31:53.177642000 -0400
++++ /tmp/fbgs1.gz.27328	2005-05-30 01:31:53.000000000 -0400
+@@ -8,9 +8,9 @@
+ .B fbgs
+ is a simple wrapper script which takes a PostScript or pdf
+ file as input, renders the pages using ghostscript into a
+-temporarely directory and finally calls fbi to display them.
++temporary directory and finally calls fbi to display them.
+ .SH OPTIONS
+-fbps understands all fbi options (they are passed throuth).
++fbps understands all fbi options (they are passed through).
+ Additionally you can specify -l, -xl or -xxl to get the pages
+ rendered with 100, 120 or 150 dpi (default is 75). You can
+ use option -p <password> if your PDF file requires password.

fbi.1.diff

@@ -0,0 +1,11 @@
+--- fbi.man	2005-05-30 01:33:43.633949000 -0400
++++ /tmp/fbi1.gz.27873	2005-05-30 01:33:43.000000000 -0400
+@@ -77,7 +77,7 @@
+ preserve timestamps (when editing images).
+ .TP
+ .B --comments
+-Display comment tags (if present) instead of the filename.  Probaby
++Display comment tags (if present) instead of the filename.  Probably
+ only useful if you added reasonable comments yourself (using wrjpgcom
+ for example), otherwise you likely just find texts pointing to the
+ software which created the image.

fbida.spec

@@ -1,17 +1,20 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
-Version:        2.03
+Version:        2.06
-Release:        5%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
-Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Source:         http://dl.bytesex.org/releases/fbida/fbida-%{version}.tar.gz
+Patch0:         fbgs.1.diff
+Patch1:         fbi.1.diff
 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
@@ -19,14 +22,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
@@ -37,20 +32,22 @@ A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
 
 %prep
 %setup -q
+%patch0
+%patch1
 %{__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
 
@@ -65,18 +62,48 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %{_bindir}/fbi
 %{_bindir}/exiftran
 
-%files ida
-%defattr(-, root, root, -)
-%doc %{_mandir}/man1/ida*
-%{_bindir}/ida
-%config %{_prefix}/X11R6/lib/X11/app-defaults/Ida
-
 %files fbgs
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/fbgs*
 %{_bindir}/fbgs
 
 %changelog
+* 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)
+- dropped fix for #200321 (included in new release)
+- added two patches from debian to fix typos in manpages
+
+* Thu Jul 27 2006 Adrian Reber <adrian@lisas.de> - 2.03-12
+- security fix for #200321
+
+* Mon Apr 24 2006 Adrian Reber <adrian@lisas.de> - 2.03-11
+- security fix for #189721
+
+* Mon Feb 13 2006 Adrian Reber <adrian@lisas.de> - 2.03-10
+- rebuilt
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-9
+- this should finally work; also on x86_64
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-8
+- rebuilt
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-7
+- moved file Ida to %%{_datadir}/X11/app-defaults
+
+* Thu Nov 24 2005 Adrian Reber <adrian@lisas.de> - 2.03-6
+- updated for modular xorg-x11
+
 * Tue May 10 2005 Adrian Reber <adrian@lisas.de> - 2.03-5
 - fix debuginfo subpackage creation
 

sources

@@ -1 +1 @@
-8fd76661686a38a7bcd251b7aadc73eb  fbida-2.03.tar.gz
+1f78e9a83fb546660a024a4bc0580ace  fbida-2.06.tar.gz