- rebuilt

fbida.spec

@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        5%{?dist}
+Release:        8%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -11,6 +11,9 @@ 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
@@ -38,6 +41,8 @@ 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
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -53,6 +58,8 @@ iconv -t UTF-8 -f ISO-8859-1 fbgs.man > fbgs.man.new
 %{__mv} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
+%{__mv} %{buildroot}%{_libdir}/X11 %{buildroot}%{_datadir}
+%{__rm} -rf %{buildroot}%{_libdir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -69,7 +76,7 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/ida*
 %{_bindir}/ida
-%config %{_prefix}/X11R6/lib/X11/app-defaults/Ida
+%config %{_datadir}/X11/app-defaults/Ida
 
 %files fbgs
 %defattr(-, root, root, -)
@@ -77,6 +84,15 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %{_bindir}/fbgs
 
 %changelog
+* 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