rpms/grass/devel grass.desktop, 1.1, 1.2 grass.spec, 1.5, 1.6 grass-overflow.patch, 1.1, NONE

[Balint Cristian (cbalint)]

Author: cbalint

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

Modified Files:
	grass.desktop grass.spec 
Removed Files:
	grass-overflow.patch 
Log Message:
new bugfix release candidate



Index: grass.desktop
===================================================================
RCS file: /cvs/extras/rpms/grass/devel/grass.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grass.desktop	20 Mar 2007 16:33:39 -0000	1.1
+++ grass.desktop	7 Jun 2007 12:00:16 -0000	1.2
@@ -7,7 +7,6 @@
 Terminal=true
 Type=Application
 Categories=Utility;
-Version=6.2.1
 
 Name[bg]=GRASS
 Comment[bg]=Географска информационна система (GIS)
@@ -37,6 +36,8 @@
 Comment[pt]=Sistema de Informação Geográfica (GIS)
 Name[pt_BR]=GRASS
 Comment[pt_BR]=Geographical Information System (GIS)
+Name[ro]=GRASS
+Comment[ro]=Sistem Geoinformatic (GIS)
 Name[sk]=GRASS
 Comment[sk]=Geografický informačný systém (GIS)
 Name[zh_CN]=GRASS


Index: grass.spec
===================================================================
RCS file: /cvs/extras/rpms/grass/devel/grass.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grass.spec	5 Jun 2007 15:16:04 -0000	1.5
+++ grass.spec	7 Jun 2007 12:00:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      grass
 Version:   6.2.2
-Release:   0.1.RC1%{?dist}
+Release:   0.2.RC1%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPL
@@ -8,10 +8,9 @@
 Source0:   http://grass.itc.it/grass62/source/grass-%{version}RC1-fedora.tar.gz  
 Source1:   grass.desktop
 Source2:   http://grass.itc.it/images/grasslogo_vector_small.png
-Patch0:    grass-overflow.patch
-Patch1:    grass-pkgconf.patch
-Patch2:    grass-shlib-soname.patch
-Patch3:    grass-license.patch
+Patch0:    grass-pkgconf.patch
+Patch1:    grass-shlib-soname.patch
+Patch2:    grass-license.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -52,10 +51,9 @@
 
 %prep
 %setup  -n %{name}-%{version}RC1-fedora -q  
-%patch0 -p0 -b .overflow~
-%patch1 -p0 -b .pkgconf~
-%patch2 -p0 -b .shlibver~
-%patch3 -p0 -b .license~
+%patch0 -p0 -b .pkgconf~
+%patch1 -p0 -b .shlibver~
+%patch2 -p0 -b .license~
 
 # readline requires ncurses, so workaround
 # correct mysql_config query
@@ -68,7 +66,6 @@
 
 %build
 
-# configure without optimizations.
 # code may contain sensible buffer overflows triggered by gcc ssp flag (mustfixupstream).
 CFLAGS=`echo %{optflags}|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2 //g'`
 # keep timestamp over install section
@@ -264,6 +261,11 @@
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Thu Jun 07 2007 Balint Cristian <cbalint at redhat.com> 6.2.2-0.2.RC1
+- fix version string in desktop file
+- add RO lang to desktop file
+- dropped one patch, seems fixed upstream.
+
 * Fri Jun 01 2007 Balint Cristian <cbalint at redhat.com> 6.2.2-0.1.RC1
 - 6.2.2 rc1 bugfix release
 - fix docbase lookup path for g.manual


--- grass-overflow.patch DELETED ---