rpms/grass/F-9 grass.spec,1.20,1.21 import.log,1.3,1.4

[Balint Cristian]

Author: rezso

Update of /cvs/pkgs/rpms/grass/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13638/F-9

Modified Files:
	grass.spec import.log 
Log Message:
- bz#458427 (prelink fail)
- bz#458563 (grass not able to display documentation)




Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/grass.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- grass.spec	5 Jul 2008 12:12:46 -0000	1.20
+++ grass.spec	24 Aug 2008 17:45:56 -0000	1.21
@@ -1,6 +1,6 @@
 Name:      grass
 Version:   6.3.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2
@@ -170,9 +170,9 @@
     %{buildroot}%{_prefix}/%{name}-%{version}/etc/gui.tcl
 sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}\/docs\//' \
     %{buildroot}%{_prefix}/%{name}-%{version}/etc/nviz2.2/scripts/nviz2.2_script
-sed -i -e 's|C_BASE="$GISBASE"|C_BASE=\"\/usr\/share\/doc\/%{name}-%{version}\/docs"|g' \
+sed -i -e 's|"$GRASS_DOC_BASE"/docs/html|\/usr\/share\/doc\/%{name}-%{version}/docs/html|g' \
     %{buildroot}%{_prefix}/%{name}-%{version}/scripts/g.manual
-sed -i -e 's|%{name}-%{version}\/docs|%{name}-%{version}|g' \
+sed -i -e 's|"$GRASS_DOC_BASE"/man|\/usr\/share\/man|g' \
     %{buildroot}%{_prefix}/%{name}-%{version}/scripts/g.manual
 sed -i -e 's|(\"GISBASE\"), \"docs\", \"html\", \"icons\", \"silk\")|(\"GISBASE\"), \"icons\", \"silk\")|g' \
     %{buildroot}%{_prefix}/%{name}-%{version}/etc/wxpython/icons/icon.py
@@ -204,6 +204,13 @@
 touch -r ChangeLog_%{version}.gz %{buildroot}%{_includedir}/%{name}/config.h
 touch -r ChangeLog_%{version}.gz %{buildroot}%{_includedir}/%{name}/config-%{cpuarch}.h
 
+# fix prelink issue bz#458427
+mkdir -p %{buildroot}%{_sysconfdir}/prelink.conf.d
+cat > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{cpuarch}.conf <<EOF
+-b %{_libdir}/libgrass_gproj.so.6.3.0
+-b %{_libdir}/libgrass_sim.so.6.3
+EOF
+
 # 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
@@ -268,7 +275,7 @@
 
 # move icon folder in GISBASE and set its path to be FHS compliant
 mv %{buildroot}%{_prefix}/%{name}-%{version}/docs/html/icons %{buildroot}%{_prefix}/grass-%{version}/
-rm -rf dist.*/docs/html/icons
+
 # switch to the system wide docs to be FHS compliant
 rm -rf %{buildroot}%{_prefix}/%{name}-%{version}/docs
 
@@ -290,6 +297,7 @@
 %doc ChangeLog_%{version} AUTHORS COPYING GPL.TXT README
 %doc REQUIREMENTS.html CHANGES translators.csv
 %doc doc dist.*/docs
+%{_sysconfdir}/prelink.conf.d/%{name}-%{cpuarch}.conf
 %{_bindir}/grass63
 %{_bindir}/gem6
 %dir %{_libdir}/%{name}-%{version}
@@ -321,6 +329,10 @@
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Sat Aug 24 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-6
+- bz#458427 (prelink fail)
+- bz#458563 (grass not able to display documentation)
+
 * Sat Jul 05 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-5
 - address bz#454146 (wxPython miss)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	5 Jul 2008 12:12:46 -0000	1.3
+++ import.log	24 Aug 2008 17:45:56 -0000	1.4
@@ -1 +1,2 @@
 grass-6_3_0-5_fc9:F-9:grass-6.3.0-5.fc9.src.rpm:1215259887
+grass-6_3_0-6_fc9:F-9:grass-6.3.0-6.fc9.src.rpm:1219599696