diff --git a/.cvsignore b/.cvsignore index da14ee9..a9c7d9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -grass-6.2.3-fedora.tar.gz +grass-6.3.0RC6.tar.gz diff --git a/grass-gdilib.patch b/grass-gdilib.patch new file mode 100644 index 0000000..3cf1a23 --- /dev/null +++ b/grass-gdilib.patch @@ -0,0 +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 @@ + + 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) + + LOCAL_HEADERS = digit.h driver.h + SOURCES = driver.cpp digit.cpp cats.cpp line.cpp vertex.cpp select.cpp grass6_wxvdigit_wrap.cpp diff --git a/grass-license.patch b/grass-license.patch deleted file mode 100644 index 1bf5ab9..0000000 --- a/grass-license.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nru grass-6.2.1-fedora.orig/gui/tcltk/menus/menu.tcl grass-6.2.1-fedora/gui/tcltk/menus/menu.tcl ---- gui/tcltk/menus/menu.tcl 2006-12-12 10:02:38.000000000 +0100 -+++ gui/tcltk/menus/menu.tcl 2007-03-20 15:46:56.000000000 +0100 -@@ -292,7 +292,6 @@ - {command {[G_msg "Carve stream channels into elevation map using vector streams map"]} {} "r.carve" {} -command {execute r.carve }} - {command {[G_msg "Depressionless elevation map and flowline map"]} {} "r.fill.dir" {} -command {execute r.fill.dir }} - {command {[G_msg "Fill lake from seed point to specified level"]} {} "r.lake" {} -command {execute r.lake }} -- {command {[G_msg "Flow accumulation for massive grids"]} {} "r.terraflow" {} -command {execute r.terraflow }} - {command {[G_msg "Generate flow lines for raster map"]} {} "r.flow" {} -command {execute r.flow }} - {command {[G_msg "SIMWE overland flow modeling"]} {} "r.sim.water" {} -command {execute r.sim.water }} - {command {[G_msg "SIMWE sediment erosion, transport, & deposition modeling"]} {} "r.sim.sediment" {} -command {execute r.sim.sediment }} -diff -Nru grass-6.2.1-fedora.orig/raster/Makefile grass-6.2.1-fedora/raster/Makefile ---- raster/Makefile 2006-12-02 06:31:11.000000000 +0100 -+++ raster/Makefile 2007-03-20 15:47:01.000000000 +0100 -@@ -110,7 +110,7 @@ - - PNGBASED = r.out.png - --CXXBASED = r.terraflow -+CXXBASED = - - TIFFBASED = r.out.tiff - diff --git a/grass-pkgconf.patch b/grass-pkgconf.patch index c28ece7..bae0b7c 100644 --- a/grass-pkgconf.patch +++ b/grass-pkgconf.patch @@ -1,22 +1,22 @@ ---- grass.pc.in.orig 2007-03-15 20:00:25.000000000 +0100 -+++ grass.pc.in 2007-03-15 20:00:33.000000000 +0100 +--- grass.pc.in.orig 2008-01-09 11:10:58.000000000 +0200 ++++ grass.pc.in 2008-03-27 17:12:00.000000000 +0200 @@ -1,12 +1,13 @@ - # Package Information for pkg-config - --prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ --exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ --libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib --includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include -+prefix=@prefix@ -+exec_prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: GRASS - Description: GRASS GIS - Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ --Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient --Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include -+Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient -+Cflags: -I${includedir}/grass -+Requires: xt x11 xproto glproto gdal + # Package Information for pkg-config + +-prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib +-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include ++prefix=@prefix@ ++exec_prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: GRASS + Description: GRASS GIS + Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ +-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient +-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include ++Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient ++Cflags: -I${includedir}/grass ++Requires: xt x11 xproto glproto gdal diff --git a/grass-shlib-soname.patch b/grass-shlib-soname.patch index 7c2adce..f7e4bd9 100644 --- a/grass-shlib-soname.patch +++ b/grass-shlib-soname.patch @@ -1,29 +1,23 @@ ---- include/Make/Shlib.make.shlibver~ 2006-02-10 16:31:42.000000000 +0100 -+++ include/Make/Shlib.make 2007-02-07 08:55:42.000000000 +0100 -@@ -1,9 +1,12 @@ +--- include/Make/Shlib.make.orig 2008-03-27 17:14:55.000000000 +0200 ++++ include/Make/Shlib.make 2008-03-27 17:17:02.000000000 +0200 +@@ -1,13 +1,17 @@ # common dependencies and rules for building shared libraries +-SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME).$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX) +GRASS_MAJOR=6 -+GRASS_MINOR=2 ++GRASS_MINOR=3 + - ifdef MINGW - SHLIB = $(ARCH_LIBDIR)/$(SHLIB_NAME)$(SHLIB_SUFFIX) - else --SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME).$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX) +SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME)$(SHLIB_SUFFIX).$(GRASS_VERSION_NUMBER) - endif - #for i18N support -@@ -15,7 +18,11 @@ + CFLAGS += $(SHLIB_CFLAGS) $(NLS_CFLAGS) LDFLAGS += $(SHLIB_LDFLAGS) $(SHLIB): $(SHLIB_OBJS) -- $(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) && if [ -z "${MINGW}" ] ; then ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@); fi +- $(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) && \ +- (cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@)) + $(SHLIB_LD) -o $@ -Wl,-soname,lib$(SHLIB_NAME)$(SHLIB_SUFFIX).$(GRASS_MAJOR).$(GRASS_MINOR) $(LDFLAGS) $^ $(EXTRA_LIBS) && \ -+ if [ -z "${MINGW}" ] ; then \ + ln -f -s $(notdir $@) $(patsubst %$(SHLIB_SUFFIX).$(GRASS_VERSION_NUMBER),%$(SHLIB_SUFFIX),$@); \ -+ ln -f -s $(notdir $@) $(patsubst %$(SHLIB_SUFFIX).$(GRASS_VERSION_NUMBER),%$(SHLIB_SUFFIX).$(GRASS_MAJOR).$(GRASS_MINOR),$@); \ -+ fi ++ ln -f -s $(notdir $@) $(patsubst %$(SHLIB_SUFFIX).$(GRASS_VERSION_NUMBER),%$(SHLIB_SUFFIX).$(GRASS_MAJOR).$(GRASS_MINOR),$@); shlib: $(SHLIB) diff --git a/grass.desktop b/grass.desktop index 074aafa..a581547 100644 --- a/grass.desktop +++ b/grass.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=GRASS Comment=Geographical Information System (GIS) -Exec=grass62 +Exec=grass63 Icon=grass.png Terminal=true Type=Application diff --git a/grass.spec b/grass.spec index 5d6f01f..0607f2b 100644 --- a/grass.spec +++ b/grass.spec @@ -1,26 +1,28 @@ Name: grass -Version: 6.2.3 -Release: 2%{?dist} +Version: 6.3.0 +Release: 0.1.RC6%{?dist} Summary: GRASS - Geographic Resources Analysis Support System Group: Applications/Engineering -License: GPL +License: GPLv2 URL: http://grass.itc.it/index.php -Source0: http://grass.itc.it/grass62/source/grass-%{version}-fedora.tar.gz +Source0: http://grass.itc.it/grass63/source/grass-%{version}RC6.tar.gz Source1: grass.desktop Source2: http://grass.itc.it/images/grasslogo_vector_small.png Patch0: grass-pkgconf.patch Patch1: grass-shlib-soname.patch -Patch2: grass-license.patch +Patch2: grass-gdilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: proj-nad proj-epsg BuildRequires: gettext BuildRequires: bison flex pkgconfig +BuildRequires: proj-devel proj-nad proj-epsg BuildRequires: desktop-file-utils libjpeg-devel BuildRequires: libtiff-devel libpng-devel freetype-devel BuildRequires: zlib-devel readline-devel ncurses-devel tk-devel BuildRequires: unixODBC-devel mysql-devel postgresql-devel sqlite-devel -BuildRequires: mesa-libGLU-devel mesa-libGLw-devel libXmu-devel lesstif-devel -BuildRequires: proj-devel geos-devel blas-devel lapack-devel fftw2-devel gdal-devel +BuildRequires: geos-devel blas-devel lapack-devel fftw2-devel gdal-devel +BuildRequires: mesa-libGLU-devel mesa-libGLw-devel libXmu-devel lesstif-devel wxPython-devel %description GRASS (Geographic Resources Analysis Support System) is a Geographic @@ -42,7 +44,7 @@ Summary: GRASS (Geographic Resources Analysis Support System) development header Group: Applications/Engineering Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig -Requires: lesstif-devel +Requires: grass-devel lesstif-devel wxPython-devel Requires: mesa-libGL-devel libX11-devel libXt-devel Requires: gdal-devel proj-devel xorg-x11-proto-devel @@ -50,10 +52,10 @@ Requires: gdal-devel proj-devel xorg-x11-proto-devel GRASS (Geographic Resources Analysis Support System) development headers. %prep -%setup -n %{name}-%{version}-fedora -q +%setup -n %{name}-%{version}RC6 -q %patch0 -p0 -b .pkgconf~ %patch1 -p0 -b .shlibver~ -%patch2 -p0 -b .license~ +%patch2 -p0 -b .gdilib~ # readline requires ncurses, so workaround # correct mysql_config query @@ -64,6 +66,18 @@ sed -i 's|--libmysqld-libs|--libs|g' configure sed -i 's|^cp |cp -p |' tools/build_html_index.sh sed -i 's|-cp |-cp -p |' Makefile +# fix spurious exec flag on source code +chmod -x raster/r.out.gdal/main.c +chmod -x general/g.message/main.c + +# convert some offendig file UTF-8 +for file in {translators.csv,doc/infrastructure.txt} ; do + if file $file | grep -q ISO-8859 ; then + iconv -f ISO-8859-1 -t UTF-8 $file > ${file}.tmp && \ + mv -f ${file}.tmp $file + fi +done + %build # code may contain sensible buffer overflows triggered by gcc ssp flag (mustfixupstream). @@ -84,7 +98,7 @@ export CFLAGS --with-proj \ --with-proj-includes=%{_includedir} \ --with-proj-libs=%{_libdir} \ - --with-proj-share=%{_libdir} \ + --with-proj-share=%{_datadir}/proj \ --with-readline \ --with-readline-includes=%{_includedir}/readline \ --with-readline-libs=%{_libdir} \ @@ -105,19 +119,18 @@ export CFLAGS --with-motif \ --with-opengl \ --with-x \ -%ifarch x86_64 ia64 ppc64 s390x sparc64 alpha + --with-wxwidgets=wx-config \ +%ifarch x86_64 ia64 ppc64 s390x sparc64 alpha --enable-64bit \ %endif %ifarch sparcv9 sparc64 --enable-64bit-vis \ -%endif +%endif --enable-largefile \ --with-cxx \ --with-python -# WARNING !!! -# dont use %{?_smp_mflags} its broken -make +make %{?_smp_mflags} %install rm -rf %{buildroot} @@ -127,57 +140,65 @@ make prefix=%{buildroot}%{_prefix} BINDIR=%{buildroot}%{_bindir} \ PREFIX=%{buildroot}%{_prefix} install # changing GISBASE in startup script to point to systems %{_libdir}%{name}-%{version} -mv %{buildroot}%{_bindir}/grass62 %{buildroot}%{_bindir}/grass62.tmp -cat %{buildroot}%{_bindir}/grass62.tmp | \ - sed -e "1,\$s&^GISBASE.*&GISBASE=%{_libdir}/%{name}-%{version}&" | \ - cat - > %{buildroot}%{_bindir}/grass62 -rm %{buildroot}%{_bindir}/grass62.tmp -chmod +x %{buildroot}%{_bindir}/grass62 +mv %{buildroot}%{_bindir}/grass63 %{buildroot}%{_bindir}/grass63.tmp +cat %{buildroot}%{_bindir}/grass63.tmp | \ + sed -e "1,\$s&^GISBASE.*&GISBASE=%{_libdir}/%{name}-%{version}RC6&" | \ + 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 | \ +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 # fix docs lookup path -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 +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 # make grass libraries available on the system -mv %{buildroot}%{_prefix}/grass-%{version}/lib/ %{buildroot}%{_libdir} +mv %{buildroot}%{_prefix}/grass-%{version}RC6/lib/ %{buildroot}%{_libdir} # make grass headers available on the system -mv %{buildroot}%{_prefix}/grass-%{version}/include %{buildroot}%{_prefix}/ -rm %{buildroot}%{_includedir}/portable.h +mv %{buildroot}%{_prefix}/grass-%{version}RC6/include %{buildroot}%{_prefix}/ +rm -rf %{buildroot}%{_includedir}/Make # make man pages aviable in system, convert some in utf8. -for manpage in {displaydrivers.1,r.sun.1,m.proj.1}; do - iconv -f iso88592 -t utf8 \ - %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage > \ - %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage.tmp - mv %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage.tmp \ - %{buildroot}%{_prefix}/grass-%{version}/man/man1/$manpage +for manpage in `find %{buildroot}%{_prefix}/grass-%{version}RC6/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 + fi done + mkdir -p %{buildroot}%{_datadir}/man/ -mv %{buildroot}%{_prefix}/grass-%{version}/man/* %{buildroot}%{_mandir} -rm -rf %{buildroot}%{_prefix}/grass-%{version}/man -gzip -d ChangeLog_%{version}.gz -iconv -f iso88592 -t utf8 ChangeLog_%{version} | \ -gzip -9 > ChangeLog_%{version}.gz +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 # make locales aviable in system, fix issue for pt_BR. mkdir -p %{buildroot}%{_datadir}/locale/ -mv %{buildroot}%{_prefix}/grass-%{version}/locale %{buildroot}%{_datadir}/ +mv %{buildroot}%{_prefix}/grass-%{version}RC6/locale %{buildroot}%{_datadir}/ mv %{buildroot}%{_datadir}/locale/pt_br %{buildroot}%{_datadir}/locale/pt_BR # pack lang sets %find_lang grassmods %find_lang grasslibs +%find_lang grasswxpy cat grassmods.lang > %{name}.lang cat grasslibs.lang >> %{name}.lang +cat grasswxpy.lang >> %{name}.lang # install pkg-config file mkdir -p %{buildroot}%{_libdir}/pkgconfig @@ -191,34 +212,38 @@ desktop-file-install --vendor="fedora" \ # fixup spurious exec flags here find %{buildroot} -name "*.tcl" -exec chmod +r-x '{}' \; -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 -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}/docs/html/nviz/help_frame.tcl +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 +# strip down a python +strip %{buildroot}%{_prefix}/grass-%{version}RC6%{_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}%{_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 + 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 done # switch to the system wide docs to be FHS compliant -rm -rf %{buildroot}%{_prefix}/%{name}-%{version}/docs +rm -rf %{buildroot}%{_prefix}/%{name}-%{version}RC6/docs # hide GISBASE into systems %{_libdir} insted, to be FHS compliant -mv %{buildroot}%{_prefix}/%{name}-%{version} %{buildroot}%{_libdir}/ - -# rename gem module loader to gem62 -mv %{buildroot}%{_bindir}/gem %{buildroot}%{_bindir}/gem62 +mv %{buildroot}%{_prefix}/%{name}-%{version}RC6 %{buildroot}%{_libdir}/ +# fix fontpath +sed -i -e 's|%{buildroot}%{_prefix}/%{name}-%{version}RC6|%{_libdir}/%{name}-%{version}RC6|' \ +%{buildroot}%{_libdir}/%{name}-%{version}RC6/etc/fontcap %clean rm -rf %{buildroot} @@ -228,13 +253,13 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING GPL.TXT README README-fedora -%doc REQUIREMENTS.html CHANGES +%doc ChangeLog_%{version}RC6 AUTHORS COPYING GPL.TXT README +%doc REQUIREMENTS.html CHANGES translators.csv %doc doc dist.*/docs -%{_bindir}/grass62 -%{_bindir}/gem62 -%dir %{_libdir}/%{name}-%{version} -%{_libdir}/%{name}-%{version}/* +%{_bindir}/grass63 +%{_bindir}/gem6 +%dir %{_libdir}/%{name}-%{version}RC6 +%{_libdir}/%{name}-%{version}RC6/* %{_datadir}/applications/fedora-grass.desktop %{_datadir}/pixmaps/grass.png %{_mandir}/man1/* @@ -246,9 +271,10 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) -%doc AUTHORS COPYING GPL.TXT README TODO -%doc ChangeLog_%{version}.gz doc/raster doc/vector +%doc AUTHORS COPYING GPL.TXT README TODO SUBMITTING* +%doc ChangeLog_%{version}RC6 doc/raster doc/vector %exclude %{_libdir}/libgrass_*.a +%exclude %{_libdir}/libiostream.a %{_libdir}/pkgconfig/%{name}.pc %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h @@ -261,6 +287,15 @@ rm -rf %{buildroot} %{_libdir}/libgrass_*.so %changelog +* Thu Mar 27 2008 Balint Cristian 6.3.0-0.1.RC6 +- new branch release +- enable new wxWidgets support +- set wxpython as default instead of tcltk +- fix missing GDI unaviable on unices +- smp build is safe now +- r.terraflow license problem fixed +- no fedora custom packs anymore, all license clear + * Tue Feb 19 2008 Fedora Release Engineering - 6.2.3-2 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 7b7a990..9c3a3b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4963446ac5325fff92f688f1bb46606 grass-6.2.3-fedora.tar.gz +16c70918f0f92fe1edb787f4bf2f4177 grass-6.3.0RC6.tar.gz