rpms/grass/devel grass.spec,1.16,1.17
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Thu Jun 12 18:54:44 UTC 2008
- Previous message (by thread): rpms/xmms-pulse/devel import.log, NONE, 1.1 xmms-pulse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/vym/EL-5 vym-0.10.0-editxlinkdialog-typeinfo.patch, NONE, 1.1 vym-0.10.0-mainwindow-typeinfo.patch, NONE, 1.1 vym-0.10.0-selection-typeinfo.patch, NONE, 1.1 vym-0.10.0-xml-vym-typeinfo.patch, NONE, 1.1 vym-1.10.0-ornamentedobj-typeinfo.patch, NONE, 1.1 vym-mainwindow.patch, 1.2, 1.3 vym-pro.patch, 1.2, 1.3 vym-tex.patch, 1.2, 1.3 vym.xml, NONE, 1.1 vym.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rezso
Update of /cvs/pkgs/rpms/grass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24943/devel
Modified Files:
grass.spec
Log Message:
- address bz#341391 (multilib issue)
----------------------------------------------------------------------
Modified Files:
devel/grass.spec
----------------------------------------------------------------------
Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/devel/grass.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grass.spec 26 May 2008 14:09:43 -0000 1.16
+++ grass.spec 12 Jun 2008 18:53:56 -0000 1.17
@@ -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
- Previous message (by thread): rpms/xmms-pulse/devel import.log, NONE, 1.1 xmms-pulse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/vym/EL-5 vym-0.10.0-editxlinkdialog-typeinfo.patch, NONE, 1.1 vym-0.10.0-mainwindow-typeinfo.patch, NONE, 1.1 vym-0.10.0-selection-typeinfo.patch, NONE, 1.1 vym-0.10.0-xml-vym-typeinfo.patch, NONE, 1.1 vym-1.10.0-ornamentedobj-typeinfo.patch, NONE, 1.1 vym-mainwindow.patch, 1.2, 1.3 vym-pro.patch, 1.2, 1.3 vym-tex.patch, 1.2, 1.3 vym.xml, NONE, 1.1 vym.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list