rpms/grass/F-9 .cvsignore, 1.6, 1.7 grass-gdilib.patch, 1.1, 1.2 grass.spec, 1.15, 1.16 sources, 1.6, 1.7
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Thu May 15 11:24:47 UTC 2008
Author: rezso
Update of /cvs/pkgs/rpms/grass/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23522/F-9
Modified Files:
.cvsignore grass-gdilib.patch grass.spec sources
Log Message:
- final stable release upstream
----------------------------------------------------------------------
Modified Files:
F-9/.cvsignore F-9/grass-gdilib.patch F-9/grass.spec
F-9/sources
----------------------------------------------------------------------
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 27 Mar 2008 21:30:34 -0000 1.6
+++ .cvsignore 15 May 2008 11:24:05 -0000 1.7
@@ -1 +1 @@
-grass-6.3.0RC6.tar.gz
+grass-6.3.0.tar.gz
grass-gdilib.patch:
Index: grass-gdilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/grass-gdilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grass-gdilib.patch 27 Mar 2008 21:30:34 -0000 1.1
+++ grass-gdilib.patch 15 May 2008 11:24:05 -0000 1.2
@@ -1,11 +1,11 @@
---- gui/wxpython/vdigit/Makefile.orig 2008-03-21 15:22:25.000000000 +0200
-+++ gui/wxpython/vdigit/Makefile 2008-03-27 18:07:26.000000000 +0200
-@@ -5,7 +5,7 @@
+--- gui/wxpython/vdigit/Makefile.orig 2008-05-15 14:04:18.000000000 +0300
++++ gui/wxpython/vdigit/Makefile 2008-05-15 14:04:30.000000000 +0300
+@@ -7,7 +7,7 @@
+ SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
- CXXFLAGS += $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
-
--LDFLAGS += $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR) $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS) -lgdi
-+LDFLAGS += $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR) $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS)
+ EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
+-EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS) -lgdi
++EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS)
LOCAL_HEADERS = digit.h driver.h
- SOURCES = driver.cpp digit.cpp cats.cpp line.cpp vertex.cpp select.cpp grass6_wxvdigit_wrap.cpp
+
Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/grass.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- grass.spec 28 Mar 2008 14:25:46 -0000 1.15
+++ grass.spec 15 May 2008 11:24:05 -0000 1.16
@@ -1,11 +1,11 @@
Name: grass
Version: 6.3.0
-Release: 0.4.RC6%{?dist}
+Release: 1%{?dist}
Summary: GRASS - Geographic Resources Analysis Support System
Group: Applications/Engineering
License: GPLv2
URL: http://grass.itc.it/index.php
-Source0: http://grass.itc.it/grass63/source/grass-%{version}RC6.tar.gz
+Source0: http://grass.itc.it/grass63/source/grass-%{version}.tar.gz
Source1: grass.desktop
Source2: http://grass.itc.it/images/grasslogo_vector_small.png
Patch0: grass-pkgconf.patch
@@ -53,7 +53,7 @@
GRASS (Geographic Resources Analysis Support System) development headers.
%prep
-%setup -n %{name}-%{version}RC6 -q
+%setup -n %{name}-%{version} -q
%patch0 -p0 -b .pkgconf~
%patch1 -p0 -b .shlibver~
%patch2 -p0 -b .gdilib~
@@ -121,10 +121,10 @@
--with-opengl \
--with-x \
--with-wxwidgets=wx-config \
-%ifarch x86_64 ia64 ppc64 s390x sparc64 alpha
+%ifarch x86_64 ia64 ppc64 s390x spa4 alpha
--enable-64bit \
%endif
-%ifarch sparcv9 sparc64
+%ifarch sparcv9 spa4
--enable-64bit-vis \
%endif
--enable-largefile \
@@ -143,40 +143,40 @@
# changing GISBASE in startup script to point to systems %{_libdir}%{name}-%{version}
mv %{buildroot}%{_bindir}/grass63 %{buildroot}%{_bindir}/grass63.tmp
cat %{buildroot}%{_bindir}/grass63.tmp | \
- sed -e "1,\$s&^GISBASE.*&GISBASE=%{_libdir}/%{name}-%{version}RC6&" | \
+ sed -e "1,\$s&^GISBASE.*&GISBASE=%{_libdir}/%{name}-%{version}&" | \
cat - > %{buildroot}%{_bindir}/grass63
rm %{buildroot}%{_bindir}/grass63.tmp
chmod +x %{buildroot}%{_bindir}/grass63
# change to wxWidgets by default
-cat %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/Init.sh | \
+cat %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh | \
sed -e '/ange to wxpython as/,/fi/ {:ack N; /fi/! b ack s/tcltk/wxpython/}' \
- > %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/Init.sh.tmp
-mv -f %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/Init.sh.tmp \
- %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/Init.sh
-chmod 744 %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/Init.sh
+ > %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh.tmp
+mv -f %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh.tmp \
+ %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh
+chmod 744 %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh
# fix docs lookup path
-sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}RC6\/docs\//' \
- %{buildroot}%{_prefix}/%{name}-%{version}RC6/etc/gis_set.tcl
-sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}RC6\/docs\//' \
- %{buildroot}%{_prefix}/%{name}-%{version}RC6/etc/gui.tcl
-sed -i -e 's/$env(GISBASE)\/docs\//\/usr\/share\/doc\/%{name}-%{version}RC6\/docs\//' \
- %{buildroot}%{_prefix}/%{name}-%{version}RC6/etc/nviz2.2/scripts/nviz2.2_script
-sed -i -e 's|C_BASE="$GISBASE"|C_BASE=\"\/usr\/share\/doc\/%{name}-%{version}RC6\/docs"|g' \
- %{buildroot}%{_prefix}/%{name}-%{version}RC6/scripts/g.manual
-sed -i -e 's|%{name}-%{version}RC6\/docs|%{name}-%{version}RC6|g' \
- %{buildroot}%{_prefix}/%{name}-%{version}RC6/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}RC6/lib/ %{buildroot}%{_libdir}
+mv %{buildroot}%{_prefix}/grass-%{version}/lib/ %{buildroot}%{_libdir}
# make grass headers available on the system
-mv %{buildroot}%{_prefix}/grass-%{version}RC6/include %{buildroot}%{_prefix}/
+mv %{buildroot}%{_prefix}/grass-%{version}/include %{buildroot}%{_prefix}/
rm -rf %{buildroot}%{_includedir}/Make
# make man pages aviable in system, convert some in utf8.
-for manpage in `find %{buildroot}%{_prefix}/grass-%{version}RC6/man/man1 -type f` ; do
+for manpage in `find %{buildroot}%{_prefix}/grass-%{version}/man/man1 -type f` ; do
if file $manpage | grep -q ISO-8859 ; then
iconv -f ISO-8859-1 -t UTF-8 $manpage > ${manpage}.tmp && \
mv -f ${manpage}.tmp $manpage
@@ -184,13 +184,13 @@
done
mkdir -p %{buildroot}%{_datadir}/man/
-mv %{buildroot}%{_prefix}/grass-%{version}RC6/man/* %{buildroot}%{_mandir}
-rm -rf %{buildroot}%{_prefix}/grass-%{version}RC6/man
-cat ChangeLog_%{version}RC6.gz | gzip -d > ChangeLog_%{version}RC6
+mv %{buildroot}%{_prefix}/grass-%{version}/man/* %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_prefix}/grass-%{version}/man
+cat ChangeLog_%{version}.gz | gzip -d > ChangeLog_%{version}
# make locales aviable in system, fix issue for pt_BR.
mkdir -p %{buildroot}%{_datadir}/locale/
-mv %{buildroot}%{_prefix}/grass-%{version}RC6/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
@@ -214,37 +214,37 @@
# fixup spurious exec flags here
find %{buildroot} -name "*.tcl" -exec chmod +r-x '{}' \;
chmod -x dist.*/docs/html/gis.m.html
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/wxpython/gui_modules/menuform.py
-chmod -x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/nviz2.2/scripts/configIndex
-chmod -x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/nviz2.2/scripts/nviz_params
-chmod -x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/nviz2.2/scripts/tclIndex
-chmod -x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/nviz2.2/scripts/panelIndex
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/gem/skeleton/post
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/gem/skeleton/uninstall
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/g.mapsets.tcl
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/dm/tksys.tcl
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/gm/tksys.tcl
-chmod +x %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/gm/animate.tcl
+chmod +x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/wxpython/gui_modules/menuform.py
+chmod -x %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/nviz2.2/scripts/configIndex
+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}%{_sysconfdir}/gm/animate.tcl
# strip down a python
-strip %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}//wxpython/vdigit/_grass6_wxvdigit.so
+strip %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}//wxpython/vdigit/_grass6_wxvdigit.so
# 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}RC6%{_sysconfdir}/nviz2.2/scripts/$nviz \
- | grep -v '#!nviz' > %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/nviz2.2/scripts/$nviz.tmp
- mv %{buildroot}%{_prefix}/grass-%{version}RC6%{_sysconfdir}/nviz2.2/scripts/$nviz.tmp \
- %{buildroot}%{_prefix}/grass-%{version}RC6%{_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}RC6/docs
+rm -rf %{buildroot}%{_prefix}/%{name}-%{version}/docs
# hide GISBASE into systems %{_libdir} insted, to be FHS compliant
-mv %{buildroot}%{_prefix}/%{name}-%{version}RC6 %{buildroot}%{_libdir}/
+mv %{buildroot}%{_prefix}/%{name}-%{version} %{buildroot}%{_libdir}/
# fix fontpath
-sed -i -e 's|%{buildroot}%{_prefix}/%{name}-%{version}RC6|%{_libdir}/%{name}-%{version}RC6|' \
-%{buildroot}%{_libdir}/%{name}-%{version}RC6/etc/fontcap
+sed -i -e 's|%{buildroot}%{_prefix}/%{name}-%{version}|%{_libdir}/%{name}-%{version}|' \
+%{buildroot}%{_libdir}/%{name}-%{version}/etc/fontcap
%clean
rm -rf %{buildroot}
@@ -254,13 +254,13 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc ChangeLog_%{version}RC6 AUTHORS COPYING GPL.TXT README
+%doc ChangeLog_%{version} AUTHORS COPYING GPL.TXT README
%doc REQUIREMENTS.html CHANGES translators.csv
%doc doc dist.*/docs
%{_bindir}/grass63
%{_bindir}/gem6
-%dir %{_libdir}/%{name}-%{version}RC6
-%{_libdir}/%{name}-%{version}RC6/*
+%dir %{_libdir}/%{name}-%{version}
+%{_libdir}/%{name}-%{version}/*
%{_datadir}/applications/fedora-grass.desktop
%{_datadir}/pixmaps/grass.png
%{_mandir}/man1/*
@@ -273,7 +273,7 @@
%files devel
%defattr(-,root,root,-)
%doc AUTHORS COPYING GPL.TXT README TODO SUBMITTING*
-%doc ChangeLog_%{version}RC6 doc/raster doc/vector
+%doc ChangeLog_%{version} doc/raster doc/vector
%exclude %{_libdir}/libgrass_*.a
%exclude %{_libdir}/libiostream.a
%{_libdir}/pkgconfig/%{name}.pc
@@ -288,6 +288,9 @@
%{_libdir}/libgrass_*.so
%changelog
+* Thu May 15 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-1
+- final stable release upstream
+
* Thu Mar 27 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-0.4.RC6
- really rebuild against latest gdal
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 27 Mar 2008 21:30:34 -0000 1.6
+++ sources 15 May 2008 11:24:05 -0000 1.7
@@ -1 +1 @@
-16c70918f0f92fe1edb787f4bf2f4177 grass-6.3.0RC6.tar.gz
+7dce50a076e2481733148ba34cbebc07 grass-6.3.0.tar.gz
More information about the scm-commits
mailing list