From 315f9ad08315ec8fd34f026242948f6e22593ab8 Mon Sep 17 00:00:00 2001
From: Balint Cristian <rezso@fedoraproject.org>
Date: May 26 2008 14:09:43 +0000
Subject: - bugfix initscripts permission

----------------------------------------------------------------------
    Modified Files: devel/.cvsignore devel/grass-gdilib.patch
    devel/grass.spec devel/sources
----------------------------------------------------------------------

---

diff --git a/.cvsignore b/.cvsignore
index a9c7d9e..0e4dad1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-grass-6.3.0RC6.tar.gz
+grass-6.3.0.tar.gz
diff --git a/grass-gdilib.patch b/grass-gdilib.patch
index 3cf1a23..d34f97b 100644
--- a/grass-gdilib.patch
+++ b/grass-gdilib.patch
@@ -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
+ 
diff --git a/grass.spec b/grass.spec
index ec617cb..6a6c76c 100644
--- a/grass.spec
+++ b/grass.spec
@@ -1,11 +1,11 @@
 Name:      grass
 Version:   6.3.0
-Release:   0.4.RC6%{?dist}
+Release:   3%{?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
@@ -16,7 +16,7 @@ Requires:  proj-nad proj-epsg
 
 BuildRequires:  gettext
 BuildRequires:  python-devel
-BuildRequires:  bison flex pkgconfig
+BuildRequires:  bison flex pkgconfig swig
 BuildRequires:  proj-devel proj-nad proj-epsg
 BuildRequires:  desktop-file-utils libjpeg-devel
 BuildRequires:  libtiff-devel libpng-devel freetype-devel
@@ -53,7 +53,7 @@ Requires: gdal-devel proj-devel xorg-x11-proto-devel
 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 @@ export CFLAGS
    --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,42 @@ make prefix=%{buildroot}%{_prefix} BINDIR=%{buildroot}%{_bindir} \
 # 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
+chmod 755 %{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}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
+cat %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh | \
+sed -e '/default if needed \- currently tcltk/,/fi/ {:ack N; /fi/! b ack  s/\"tcltk/\"wxpython/}' \
+    > %{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 755 %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh
+
+# fix icons and 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|(\"GISBASE\"), \"docs\", \"html\", \"icons\", \"silk\")|(\"GISBASE\"), \"icons\", \"silk\")|g' \
+    %{buildroot}%{_prefix}/%{name}-%{version}/etc/wxpython/icons/icon.py
 
 # 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 +186,13 @@ for manpage in `find %{buildroot}%{_prefix}/grass-%{version}RC6/man/man1 -type f
 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 +216,40 @@ desktop-file-install --vendor="fedora" \
 # 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
 
+# move icon folder in GISBASE and set its path to be FHS compliant
+mv %{buildroot}%{_prefix}/%{name}-%{version}/docs/html/icons %{buildroot}%{_prefix}/grass-%{version}/
+rm -rf dist.*/docs/html/icons
 # 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}/
+# hide whole GISBASE into systems %{_libdir} insted, to be FHS compliant
+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 +259,13 @@ rm -rf %{buildroot}
 
 %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 +278,7 @@ rm -rf %{buildroot}
 %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 +293,15 @@ rm -rf %{buildroot}
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Mon May 23 2008 Balint Cristian <rezso@rdsor.ro> 6.3.0-3
+- bugfix initscripts permission
+
+* Thu May 15 2008 Balint Cristian <rezso@rdsor.ro> 6.3.0-2
+- require swig to build
+
+* Thu May 15 2008 Balint Cristian <rezso@rdsor.ro> 6.3.0-1
+- final stable release upstream
+
 * Thu Mar 27 2008 Balint Cristian <rezso@rdsor.ro> 6.3.0-0.4.RC6
 - really rebuild against latest gdal
 
diff --git a/sources b/sources
index 9c3a3b8..69b5564 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16c70918f0f92fe1edb787f4bf2f4177  grass-6.3.0RC6.tar.gz
+7dce50a076e2481733148ba34cbebc07  grass-6.3.0.tar.gz