diff --git a/grass-overflow.patch b/grass-overflow.patch deleted file mode 100644 index 7523321..0000000 --- a/grass-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- imagery/i.ortho.photo/photo.elev/main.c.orig 2007-02-07 01:30:13.000000000 +0100 -+++ imagery/i.ortho.photo/photo.elev/main.c 2007-02-07 01:21:40.000000000 +0100 -@@ -88,7 +88,7 @@ - - error: - strcat (buf, "Please select a target for group"); -- strcat (buf, group); -+// strcat (buf, group); - G_suppress_warnings(0); - G_fatal_error (buf); - } diff --git a/grass.desktop b/grass.desktop index fcd0111..074aafa 100644 --- a/grass.desktop +++ b/grass.desktop @@ -7,7 +7,6 @@ Icon=grass.png Terminal=true Type=Application Categories=Utility; -Version=6.2.1 Name[bg]=GRASS Comment[bg]=Географска информационна система (GIS) @@ -37,6 +36,8 @@ Name[pt]=GRASS 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 diff --git a/grass.spec b/grass.spec index ca7a54d..7209b48 100644 --- a/grass.spec +++ b/grass.spec @@ -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 @@ URL: http://grass.itc.it/index.php 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 @@ GRASS (Geographic Resources Analysis Support System) development headers. %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 @@ sed -i 's|-cp |-cp -p |' Makefile %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 @@ rm -rf %{buildroot} %{_libdir}/libgrass_*.so %changelog +* Thu Jun 07 2007 Balint Cristian 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 6.2.2-0.1.RC1 - 6.2.2 rc1 bugfix release - fix docbase lookup path for g.manual