rpms/grass/FC-6 .cvsignore, 1.2, 1.3 grass.desktop, 1.1, 1.2 grass.spec, 1.2, 1.3 sources, 1.2, 1.3 grass-overflow.patch, 1.1, NONE

Balint Cristian (cbalint) fedora-extras-commits at redhat.com
Wed Jul 25 14:11:28 UTC 2007 

Author: cbalint

Update of /cvs/extras/rpms/grass/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971/FC-6

Modified Files:
	.cvsignore grass.desktop grass.spec sources 
Removed Files:
	grass-overflow.patch 
Log Message:
- new upstream stable version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grass/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Mar 2007 16:35:46 -0000	1.2
+++ .cvsignore	25 Jul 2007 14:10:55 -0000	1.3
@@ -1 +1 @@
-grass-6.2.1-fedora.tar.gz
+grass-6.2.2-fedora.tar.gz


Index: grass.desktop
===================================================================
RCS file: /cvs/extras/rpms/grass/FC-6/grass.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grass.desktop	20 Mar 2007 16:35:46 -0000	1.1
+++ grass.desktop	25 Jul 2007 14:10:55 -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/FC-6/grass.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grass.spec	2 Apr 2007 12:13:26 -0000	1.2
+++ grass.spec	25 Jul 2007 14:10:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:      grass
-Version:   6.2.1
-Release:   14%{?dist}
+Version:   6.2.2
+Release:   1%{?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}-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}-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
@@ -146,6 +143,8 @@
     %{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}/lib/ %{buildroot}%{_libdir}
@@ -192,7 +191,7 @@
 
 # fixup spurious exec flags here
 find %{buildroot} -name "*.tcl" -exec chmod +r-x '{}' \;
-chmod -x dist.%{_host}/docs/html/nviz/help_frame.tcl
+chmod -x dist.*/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
@@ -231,7 +230,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING GPL.TXT README README-fedora
 %doc REQUIREMENTS.html CHANGES
-%doc doc dist.%{_host}/docs
+%doc doc dist.*/docs
 %{_bindir}/grass62
 %{_bindir}/gem62
 %dir %{_libdir}/%{name}-%{version}
@@ -262,9 +261,27 @@
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Wed Jul 25 2007 Balint Cristian <cbalint at redhat.com> 6.2.2-1
+- new upstream stable version
+
+* 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
+
+* Sat May 12 2007 Balint Cristian <cbalint at redhat.com> 6.2.1-16
+- fix koji build for ppc ppc64, dont use _host macro anymore.
+
+* Sat May 12 2007 Balint Cristian <cbalint at redhat.com> 6.2.1-15
+- rebuild against new gdal
+
 * Mon Apr 02 2007 Balint Cristian <cbalint at redhat.com> 6.2.1-14
 - remove bogus requirement in grass-libs
- - rename gem loader to gem62
+- rename gem loader to gem62
 
 * Tue Mar 20 2007 Balint Cristian <cbalint at redhat.com> 6.2.1-13
 - see README-fedora for license fix in redistributed tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grass/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Mar 2007 16:35:46 -0000	1.2
+++ sources	25 Jul 2007 14:10:55 -0000	1.3
@@ -1 +1 @@
-85718f596a118edfe8647d35e6f191e1  grass-6.2.1-fedora.tar.gz
+6e9139722a643301338b51ec897b6e05  grass-6.2.2-fedora.tar.gz


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

More information about the scm-commits mailing list