From 9ff69c9de1197f7c541d6816efc1b8696852b0a0 Mon Sep 17 00:00:00 2001
From: Balint Cristian <cbalint@fedoraproject.org>
Date: Jul 25 2007 12:58:00 +0000
Subject: - new upstream stable version


---

diff --git a/.cvsignore b/.cvsignore
index f0849c7..99ab6f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-grass-6.2.2RC1-fedora.tar.gz
+grass-6.2.2-fedora.tar.gz
diff --git a/grass.spec b/grass.spec
index 7209b48..7d72c94 100644
--- a/grass.spec
+++ b/grass.spec
@@ -1,11 +1,11 @@
 Name:      grass
 Version:   6.2.2
-Release:   0.2.RC1%{?dist}
+Release:   1%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPL
 URL:       http://grass.itc.it/index.php
-Source0:   http://grass.itc.it/grass62/source/grass-%{version}RC1-fedora.tar.gz  
+Source0:   http://grass.itc.it/grass62/source/grass-%{version}-fedora.tar.gz  
 Source1:   grass.desktop
 Source2:   http://grass.itc.it/images/grasslogo_vector_small.png
 Patch0:    grass-pkgconf.patch
@@ -50,7 +50,7 @@ Requires: gdal-devel proj-devel xorg-x11-proto-devel
 GRASS (Geographic Resources Analysis Support System) development headers.
 
 %prep
-%setup  -n %{name}-%{version}RC1-fedora -q  
+%setup  -n %{name}-%{version}-fedora -q  
 %patch0 -p0 -b .pkgconf~
 %patch1 -p0 -b .shlibver~
 %patch2 -p0 -b .license~
@@ -129,48 +129,48 @@ make prefix=%{buildroot}%{_prefix} BINDIR=%{buildroot}%{_bindir} \
 # changing GISBASE in startup script to point to systems %{_libdir}%{name}-%{version}
 mv  %{buildroot}%{_bindir}/grass62 %{buildroot}%{_bindir}/grass62.tmp
 cat %{buildroot}%{_bindir}/grass62.tmp | \
-    sed -e "1,\$s&^GISBASE.*&GISBASE=%{_libdir}/%{name}-%{version}RC1&" | \
+    sed -e "1,\$s&^GISBASE.*&GISBASE=%{_libdir}/%{name}-%{version}&" | \
     cat - > %{buildroot}%{_bindir}/grass62
 rm  %{buildroot}%{_bindir}/grass62.tmp
 chmod +x %{buildroot}%{_bindir}/grass62
 
 # fix docs lookup path
-sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}RC1\/docs\//' \
-    %{buildroot}%{_prefix}/%{name}-%{version}RC1/etc/gis_set.tcl
-sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}RC1\/docs\//' \
-    %{buildroot}%{_prefix}/%{name}-%{version}RC1/etc/gui.tcl
-sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}RC1\/docs\//' \
-    %{buildroot}%{_prefix}/%{name}-%{version}RC1/etc/nviz2.2/scripts/nviz2.2_script
-sed -i -e 's|C_BASE="$GISBASE"|C_BASE=\"\/usr\/share\/doc\/%{name}-%{version}RC1\/docs"|g' \
-    %{buildroot}%{_prefix}/%{name}-%{version}RC1/scripts/g.manual
-sed -i -e 's|%{name}-%{version}RC1\/docs|%{name}-%{version}RC1|g' \
-    %{buildroot}%{_prefix}/%{name}-%{version}RC1/scripts/g.manual
+sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}\/docs\//' \
+    %{buildroot}%{_prefix}/%{name}-%{version}/etc/gis_set.tcl
+sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}\/docs\//' \
+    %{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' \
+    %{buildroot}%{_prefix}/%{name}-%{version}/scripts/g.manual
+sed -i -e 's|%{name}-%{version}\/docs|%{name}-%{version}|g' \
+    %{buildroot}%{_prefix}/%{name}-%{version}/scripts/g.manual
 
 # make grass libraries available on the system
-mv %{buildroot}%{_prefix}/grass-%{version}RC1/lib/ %{buildroot}%{_libdir}
+mv %{buildroot}%{_prefix}/grass-%{version}/lib/ %{buildroot}%{_libdir}
 
 # make grass headers available on the system
-mv %{buildroot}%{_prefix}/grass-%{version}RC1/include %{buildroot}%{_prefix}/
+mv %{buildroot}%{_prefix}/grass-%{version}/include %{buildroot}%{_prefix}/
 rm %{buildroot}%{_includedir}/portable.h 
 
 # make man pages aviable in system, convert some in utf8.
 for manpage in {displaydrivers.1,r.sun.1,m.proj.1}; do
     iconv -f iso88592 -t utf8 \
-        %{buildroot}%{_prefix}/grass-%{version}RC1/man/man1/$manpage > \
-        %{buildroot}%{_prefix}/grass-%{version}RC1/man/man1/$manpage.tmp
-     mv %{buildroot}%{_prefix}/grass-%{version}RC1/man/man1/$manpage.tmp \
-        %{buildroot}%{_prefix}/grass-%{version}RC1/man/man1/$manpage
+        %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage > \
+        %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage.tmp
+     mv %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage.tmp \
+        %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage
 done
 mkdir -p %{buildroot}%{_datadir}/man/
-mv  %{buildroot}%{_prefix}/grass-%{version}RC1/man/* %{buildroot}%{_mandir}
-rm -rf %{buildroot}%{_prefix}/grass-%{version}RC1/man
-gzip -d ChangeLog_%{version}RC1.gz
-iconv -f iso88592 -t utf8 ChangeLog_%{version}RC1 | \
-gzip -9 > ChangeLog_%{version}RC1.gz
+mv  %{buildroot}%{_prefix}/grass-%{version}/man/* %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_prefix}/grass-%{version}/man
+gzip -d ChangeLog_%{version}.gz
+iconv -f iso88592 -t utf8 ChangeLog_%{version} | \
+gzip -9 > ChangeLog_%{version}.gz
 
 # make locales aviable in system, fix issue for pt_BR.
 mkdir -p %{buildroot}%{_datadir}/locale/
-mv %{buildroot}%{_prefix}/grass-%{version}RC1/locale %{buildroot}%{_datadir}/
+mv %{buildroot}%{_prefix}/grass-%{version}/locale %{buildroot}%{_datadir}/
 mv %{buildroot}%{_datadir}/locale/pt_br %{buildroot}%{_datadir}/locale/pt_BR
 
 # pack lang sets
@@ -192,29 +192,29 @@ desktop-file-install --vendor="fedora" \
 # fixup spurious exec flags here
 find %{buildroot} -name "*.tcl" -exec chmod +r-x '{}' \;
 chmod -x dist.*/docs/html/nviz/help_frame.tcl
-chmod -x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/nviz2.2/scripts/nviz_params
-chmod -x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/nviz2.2/scripts/tclIndex
-chmod -x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/nviz2.2/scripts/panelIndex
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/gem/skeleton/post
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/gem/skeleton/uninstall
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/g.mapsets.tcl
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/dm/tksys.tcl
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/gm/tksys.tcl
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC1/docs/html/nviz/help_frame.tcl
+chmod -x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/nviz_params
+chmod -x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/tclIndex
+chmod -x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/panelIndex
+chmod +x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/gem/skeleton/post
+chmod +x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/gem/skeleton/uninstall
+chmod +x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/g.mapsets.tcl
+chmod +x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/dm/tksys.tcl
+chmod +x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/gm/tksys.tcl
+chmod +x %{buildroot}%{_prefix}/grass-%{version}/docs/html/nviz/help_frame.tcl
 
 # fixup few nviz script header, it will anyway allways executed by nviz
 for nviz in {script_play,nviz2.2_script,script_tools,script_file_tools,script_get_line}; do
- cat %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/nviz2.2/scripts/$nviz \
-  | grep -v '#!nviz' > %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/nviz2.2/scripts/$nviz.tmp 
- mv  %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/nviz2.2/scripts/$nviz.tmp \
-     %{buildroot}%{_prefix}/grass-%{version}RC1%{_sysconfdir}/nviz2.2/scripts/$nviz
+ cat %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/$nviz \
+  | grep -v '#!nviz' > %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/$nviz.tmp 
+ mv  %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/$nviz.tmp \
+     %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/$nviz
 done
 
 # switch to the system wide docs to be FHS compliant
-rm -rf %{buildroot}%{_prefix}/%{name}-%{version}RC1/docs
+rm -rf %{buildroot}%{_prefix}/%{name}-%{version}/docs
 
 # hide GISBASE into systems %{_libdir} insted, to be FHS compliant
-mv %{buildroot}%{_prefix}/%{name}-%{version}RC1 %{buildroot}%{_libdir}/
+mv %{buildroot}%{_prefix}/%{name}-%{version} %{buildroot}%{_libdir}/
 
 # rename gem module loader to gem62
 mv %{buildroot}%{_bindir}/gem %{buildroot}%{_bindir}/gem62
@@ -233,8 +233,8 @@ rm -rf %{buildroot}
 %doc doc dist.*/docs
 %{_bindir}/grass62
 %{_bindir}/gem62
-%dir %{_libdir}/%{name}-%{version}RC1
-%{_libdir}/%{name}-%{version}RC1/*
+%dir %{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}-%{version}/*
 %{_datadir}/applications/fedora-grass.desktop
 %{_datadir}/pixmaps/grass.png
 %{_mandir}/man1/*
@@ -247,7 +247,7 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING GPL.TXT README TODO
-%doc ChangeLog_%{version}RC1.gz doc/raster doc/vector 
+%doc ChangeLog_%{version}.gz doc/raster doc/vector 
 %exclude %{_libdir}/libgrass_*.a
 %{_libdir}/pkgconfig/%{name}.pc
 %dir %{_includedir}/%{name}
@@ -261,6 +261,9 @@ rm -rf %{buildroot}
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Wed Jul 25 2007 Balint Cristian <cbalint@redhat.com> 6.2.2-1
+- new upstream stable version
+
 * Thu Jun 07 2007 Balint Cristian <cbalint@redhat.com> 6.2.2-0.2.RC1
 - fix version string in desktop file
 - add RO lang to desktop file
diff --git a/sources b/sources
index f7fd7f1..12aacda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac49d6bca80c8795a79bca5a6a0d60bd  grass-6.2.2RC1-fedora.tar.gz
+6e9139722a643301338b51ec897b6e05  grass-6.2.2-fedora.tar.gz