rpms/fbida/devel fbida.spec,1.8,1.9

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26949

Modified Files:
	fbida.spec 
Log Message:
* Thu Nov 24 2005 Adrian Reber <adrian at lisas.de> - 2.03-6
- updated for modular xorg-x11



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fbida.spec	10 May 2005 07:08:12 -0000	1.8
+++ fbida.spec	24 Nov 2005 08:19:46 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -11,6 +11,9 @@
 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 @@
 %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}
@@ -69,7 +74,7 @@
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/ida*
 %{_bindir}/ida
-%config %{_prefix}/X11R6/lib/X11/app-defaults/Ida
+%config %{_prefix}/lib/X11/app-defaults/Ida
 
 %files fbgs
 %defattr(-, root, root, -)
@@ -77,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Thu Nov 24 2005 Adrian Reber <adrian at lisas.de> - 2.03-6
+- updated for modular xorg-x11
+
 * Tue May 10 2005 Adrian Reber <adrian at lisas.de> - 2.03-5
 - fix debuginfo subpackage creation