- moved file Ida to %{_datadir}/X11/app-defaults

- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.

.cvsignore

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

fbida.spec

@@ -1,52 +1,110 @@
-# $Id: fbida.spec,v 1.1 2004/12/17 18:54:17 scop Exp $
-
-Summary:       FrameBuffer Imageviewer
-Name:          fbida
-Version:       2.02
-Release:       1
-License:       GPL
-Group:         Applications/Multimedia
-URL:           http://linux.bytesex.org/fbida/
-Source:        http://dl.bytesex.org/releases/fbida/fbida-2.02.tar.gz
-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
-Requires:      ImageMagick bitstream-vera-fonts
+Summary:        FrameBuffer Imageviewer
+Name:           fbida
+Version:        2.03
+Release:        7%{?dist}
+License:        GPL
+Group:          Applications/Multimedia
+URL:            http://linux.bytesex.org/fbida/
+Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+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
+# this is until #173530 and #173884 is fixed
+BuildRequires:  libXau-devel
+Requires:       ImageMagick bitstream-vera-fonts
 
 %description
 fbi displays the specified file(s) on the linux console using the
 framebuffer device. PhotoCD, jpeg, ppm, gif, tiff, xwd, bmp and png
-are supported directly. For other formats fbi tries to use 
+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
+Requires: ghostscript fbida
+
+%description fbgs
+A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
+
 %prep
 %setup -q
+%{__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,/usr/lib/X11,g" mk/Autoconf.mk
 
 %build
-prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
+LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
 
 %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 
-prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
-# currently no fbgs due to dependency on ghostscript
-%{__rm} %{buildroot}%{_bindir}/fbgs
-%{__rm} %{buildroot}%{_mandir}/man1/fbgs.1
+%{__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
+%{__mv} %{buildroot}%{_sysconfdir}/X11 %{buildroot}%{_datadir}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes COPYING README TODO 
-%doc %{_mandir}/man1/*
-%{_bindir}/*
+%doc Changes COPYING README TODO
+%doc %{_mandir}/man1/fbi*
+%doc %{_mandir}/man1/exiftran*
+%{_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
+* 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
+
+* Mon Apr 04 2005 Adrian Reber <adrian@lisas.de> - 2.03-4
+- rebuild for new libexif
+
+* Mon Feb 21 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.03-3
+- Fix typo; must be LIB=%%{_lib}; really fixes x86_64
+
+* Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.03-2
+- lib=%%{_lib} in make call; fixes x86_64
+
+* Fri Feb 11 2005 Adrian Reber <adrian@lisas.de> - 2.03-1
+- updated to 2.03
+- created subpackages for ida and fbgs
+
 * Sun Nov 28 2004 Adrian Reber <adrian@lisas.de> - 2.02-1
 - updated to 2.02
 - converted manpages to UTF-8

sources

@@ -1 +1 @@
-1406719fb06c663d5557951ca5f711aa  fbida-2.02.tar.gz
+8fd76661686a38a7bcd251b7aadc73eb  fbida-2.03.tar.gz