From 2cb6812863acb3f50b020ee6d106fcbad6779570 Mon Sep 17 00:00:00 2001 From: Balint Cristian Date: Jul 25 2007 14:10:55 +0000 Subject: - new upstream stable version --- diff --git a/.cvsignore b/.cvsignore index 1d9a55c..99ab6f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -grass-6.2.1-fedora.tar.gz +grass-6.2.2-fedora.tar.gz 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 d2e14ed..7d72c94 100644 --- a/grass.spec +++ b/grass.spec @@ -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 @@ URL: http://grass.itc.it/index.php 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 @@ GRASS (Geographic Resources Analysis Support System) development headers. %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 @@ 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 @@ -146,6 +143,8 @@ 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}/lib/ %{buildroot}%{_libdir} @@ -192,7 +191,7 @@ desktop-file-install --vendor="fedora" \ # 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 @@ rm -rf %{buildroot} %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 @@ rm -rf %{buildroot} %{_libdir}/libgrass_*.so %changelog +* Wed Jul 25 2007 Balint Cristian 6.2.2-1 +- new upstream stable version + +* 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 + +* Sat May 12 2007 Balint Cristian 6.2.1-16 +- fix koji build for ppc ppc64, dont use _host macro anymore. + +* Sat May 12 2007 Balint Cristian 6.2.1-15 +- rebuild against new gdal + * Mon Apr 02 2007 Balint Cristian 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 6.2.1-13 - see README-fedora for license fix in redistributed tarball diff --git a/sources b/sources index d8e36f6..12aacda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85718f596a118edfe8647d35e6f191e1 grass-6.2.1-fedora.tar.gz +6e9139722a643301338b51ec897b6e05 grass-6.2.2-fedora.tar.gz