rpms/grass/F-9 import.log,NONE,1.1 grass.spec,1.18,1.19

[Balint Cristian (rezso)]

Author: rezso

Update of /cvs/pkgs/rpms/grass/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv463/F-9

Modified Files:
	grass.spec 
Added Files:
	import.log 
Log Message:
- address bz#341391 (multilib issue)
 ----------------------------------------------------------------------
 Modified Files:
 	F-9/grass.spec 
 Added Files:
 	F-9/import.log 
 ----------------------------------------------------------------------



--- NEW FILE import.log ---
grass-6_3_0-4_fc9:F-9:grass-6.3.0-4.fc9.src.rpm:1213297240


Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/grass.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- grass.spec	26 May 2008 14:27:19 -0000	1.18
+++ grass.spec	12 Jun 2008 19:15:19 -0000	1.19
@@ -1,6 +1,6 @@
 Name:      grass
 Version:   6.3.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2
@@ -25,6 +25,13 @@
 BuildRequires:  geos-devel blas-devel lapack-devel fftw2-devel gdal-devel
 BuildRequires:  mesa-libGLU-devel mesa-libGLw-devel libXmu-devel lesstif-devel wxPython-devel
 
+# we have multilib triage
+%if "%{_lib}" == "lib"
+%define cpuarch 32
+%else
+%define cpuarch 64
+%endif
+
 %description
 GRASS (Geographic Resources Analysis Support System) is a Geographic
 Information System (GIS) used for geospatial data management and
@@ -177,6 +184,26 @@
 mv %{buildroot}%{_prefix}/grass-%{version}/include %{buildroot}%{_prefix}/
 rm -rf %{buildroot}%{_includedir}/Make
 
+# create universal multilib header bz#341391
+install -p -m 644 %{buildroot}%{_includedir}/%{name}/config.h \
+           %{buildroot}%{_includedir}/%{name}/config-%{cpuarch}.h
+
+cat > %{buildroot}%{_includedir}/%{name}/config.h <<EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "grass/config-32.h"
+#else
+#if __WORDSIZE == 64
+#include "grass/config-64.h"
+#else
+#error "Unknown word size"
+#endif
+#endif
+EOF
+touch -r ChangeLog_%{version}.gz %{buildroot}%{_includedir}/%{name}/config.h
+touch -r ChangeLog_%{version}.gz %{buildroot}%{_includedir}/%{name}/config-%{cpuarch}.h
+
 # make man pages aviable in system, convert some in utf8.
 for manpage in `find %{buildroot}%{_prefix}/grass-%{version}/man/man1 -type f` ; do
    if file $manpage | grep -q ISO-8859 ; then
@@ -189,6 +216,7 @@
 mv  %{buildroot}%{_prefix}/grass-%{version}/man/* %{buildroot}%{_mandir}
 rm -rf %{buildroot}%{_prefix}/grass-%{version}/man
 cat ChangeLog_%{version}.gz | gzip -d > ChangeLog_%{version}
+touch -r ChangeLog_%{version}.gz ChangeLog_%{version}
 
 # make locales aviable in system, fix issue for pt_BR.
 mkdir -p %{buildroot}%{_datadir}/locale/
@@ -293,6 +321,9 @@
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Thu Jun 12 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-4
+- address bz#341391 (multilib issue)
+
 * Mon May 23 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-3
 - bugfix initscripts permission