rpms/fbida/devel fbida.spec,1.11,1.12

[Adrian Reber (adrian)]

Author: adrian

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

Modified Files:
	fbida.spec 
Log Message:
* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-9
- this should finally work; also on x86_64



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fbida.spec	19 Jan 2006 12:26:45 -0000	1.11
+++ fbida.spec	20 Jan 2006 09:10:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -42,7 +42,7 @@
 %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
+%{__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}
@@ -58,8 +58,6 @@
 %{__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}
@@ -84,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-9
+- this should finally work; also on x86_64
+
 * Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-8
 - rebuilt