- obsoleted fbida-ida subpackage (#208457)

.cvsignore

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

fbida.spec

@@ -1,20 +1,20 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
-Version:        2.05
-Release:        1%{?dist}
+Version:        2.06
+Release:        2%{?dist}
 License:        GPL
 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
 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 +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
@@ -47,17 +39,15 @@ A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
 %{__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 +62,18 @@ 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 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)

sources

@@ -1 +1 @@
-7a624bb9f08e76c80e79eca2fbbe770d  fbida-2.05.tar.gz
+1f78e9a83fb546660a024a4bc0580ace  fbida-2.06.tar.gz