- updated to 6.2.0, updated soname patch, added link patch, removed obsolete tk85...

Changed files:
    grass.spec -> 1.33

diff --git a/grass.spec b/grass.spec
index 7f3ebcf7b4fa97ebdc3900be5a684dc137549cd0..0f12e202d1d7d8d3edcf5dfcf17b23b6069d945c 100644 (file)
--- a/grass.spec
+++ b/grass.spec
@@ -1,20 +1,21 @@
 Summary:       The Geographic Resources Analysis Support System
 Summary(pl):   System obs³uguj±cy analizê zasobów geograficznych
 Name:          grass
-Version:       6.0.1
-Release:       3
+Version:       6.2.0
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
-Source0:       ftp://grass.itc.it/pub/grass/grass60/source/%{name}-%{version}.tar.gz
-# Source0-md5: 5225e816895d5e6b28bca623f76acaad
-Patch0:                %{name}-tk85.patch
-Patch1:                %{name}-soname.patch
+Source0:       http://grass.itc.it/grass62/source/%{name}-%{version}.tar.gz
+# Source0-md5: 678de1dbbc0e20001f3de6b1be7565b4
+Patch0:                %{name}-soname.patch
+Patch1:                %{name}-link.patch
 URL:           http://grass.itc.it/
-BuildRequires: OpenGL-devel
+BuildRequires: OpenGL-GLU-devel
 BuildRequires: awk
 BuildRequires: bison
 BuildRequires: blas-devel
+BuildRequires: ffmpeg-devel
 BuildRequires: fftw-devel
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.0
@@ -33,14 +34,18 @@ BuildRequires:      mysql-devel
 BuildRequires: ncurses-devel
 BuildRequires: postgresql-backend-devel
 BuildRequires: postgresql-devel
-BuildRequires: proj-devel
+BuildRequires: proj-devel >= 4.4.6
 BuildRequires: proj-progs
+BuildRequires: python-devel >= 1:2.3
 BuildRequires: readline-devel
 BuildRequires: sed >= 4.0
-BuildRequires: tcl-devel
-BuildRequires: tk-devel
+BuildRequires: sqlite3-devel >= 3.0
+BuildRequires: tcl-devel >= 8.4
+BuildRequires: tk-devel >= 8.4
 BuildRequires: unixODBC-devel
 BuildRequires: zlib-devel
+# R language?
+Requires:      proj >= 4.4.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _noautoreqdep   libGL.so.1 libGLU.so.1
@@ -72,7 +77,7 @@ Oracle.
 Summary:       NVIZ - a 3D-tool for GRASS
 Summary(pl):   NVIZ - narzêdzie 3D dla GRASSa
 Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description OpenGL
 Package contains nviz, which is a GRASS module-in-progress which
@@ -92,7 +97,7 @@ GRASSa.
 Summary:       PostgreSQL database interface
 Summary(pl):   Interfejs do bazy PostgreSQL
 Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description pg
 PostgreSQL database interface for GRASS.
@@ -104,7 +109,7 @@ Interfejs do bazy PostgreSQL dla GRASSa.
 Summary:       ODBC database interface
 Summary(pl):   Interfejs ODBC dla GRASSa
 Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description odbc
 ODBC database interface for GRASS.
@@ -129,13 +134,15 @@ Pliki nag
 %patch1 -p1
 
 %build
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses"; export CFLAGS
-CPPFLAGS="-I/usr/include/ncurses -I/usr/X11R6/include"; export CPPFLAGS
+CPPFLAGS="-I/usr/include/ncurses"; export CPPFLAGS
 %configure2_13 \
+       --enable-largefile \
        --with-includes=%{_includedir} \
        --with-libs=%{_libdir} \
        --with-blas \
        --with-cxx \
+       --with-ffmpeg \
+       --with-ffmpeg-includes=/usr/include/ffmpeg \
        --with-freetype \
        --with-freetype-includes=/usr/include/freetype2 \
        --with-lapack \
@@ -145,7 +152,10 @@ CPPFLAGS="-I/usr/include/ncurses -I/usr/X11R6/include"; export CPPFLAGS
        --with-nls \
        --with-odbc \
        --with-postgres-includes=/usr/include/postgresql/server \
-       --with-readline
+       --with-proj-share=/usr/share/proj \
+       --with-python \
+       --with-readline \
+       --with-sqlite
 %{__make}
 
 %install
@@ -156,19 +166,22 @@ rm -rf $RPM_BUILD_ROOT
        BINDIR=$RPM_BUILD_ROOT%{_bindir} \
        PREFIX=$RPM_BUILD_ROOT%{_libdir}
 
-install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir}/grass60}
-mv $RPM_BUILD_ROOT%{_libdir}/grass-%{version}/include/* $RPM_BUILD_ROOT%{_includedir}/grass60
+install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir}/grass62}
+mv $RPM_BUILD_ROOT%{_libdir}/grass-%{version}/include/* $RPM_BUILD_ROOT%{_includedir}/grass62
 mv $RPM_BUILD_ROOT%{_libdir}/grass-%{version}/lib/* $RPM_BUILD_ROOT%{_libdir}
 mv $RPM_BUILD_ROOT%{_libdir}/grass-%{version}/locale $RPM_BUILD_ROOT%{_datadir}
 mv $RPM_BUILD_ROOT%{_libdir}/grass-%{version}/man $RPM_BUILD_ROOT%{_datadir}
 
-sed -i -e 's,^GISBASE=.*,GISBASE=%{_libdir}/grass-%{version},' $RPM_BUILD_ROOT%{_bindir}/grass60
+sed -i -e 's,^GISBASE=.*,GISBASE=%{_libdir}/grass-%{version},' $RPM_BUILD_ROOT%{_bindir}/grass62
 
 cp -f lib/external/bwidget/CHANGES.txt bwidget.CHANGES.TXT
 cp -f lib/external/bwidget/README.grass bwidget.README.grass
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/grass-%{version}/{bwidget/{*.txt,README.grass},docs}
 
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{pt_br,pt_BR}
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh,zh_CN}
+
 %find_lang %{name} --all-name
 
 %clean
@@ -202,12 +215,35 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/grass-%{version}/etc/dm/*.tcl
 %dir %{_libdir}/grass-%{version}/etc/dm/script
 %attr(755,root,root) %{_libdir}/grass-%{version}/etc/dm/script/*
+%attr(755,root,root) %{_libdir}/grass-%{version}/etc/file_option.tcl
 %dir %{_libdir}/grass-%{version}/etc/form
 %attr(755,root,root) %{_libdir}/grass-%{version}/etc/form/form
 %{_libdir}/grass-%{version}/etc/form/*.tcl
+%{_libdir}/grass-%{version}/etc/gem
+%{_libdir}/grass-%{version}/etc/gintro.gif
+%dir %{_libdir}/grass-%{version}/etc/gm
+%attr(755,root,root) %{_libdir}/grass-%{version}/etc/gm/*.tcl
+%{_libdir}/grass-%{version}/etc/gm/*.gif
+%dir %{_libdir}/grass-%{version}/etc/gm/script
+%attr(755,root,root) %{_libdir}/grass-%{version}/etc/gm/script/*
+%attr(755,root,root) %{_libdir}/grass-%{version}/etc/grass-xterm-wrapper
+%{_libdir}/grass-%{version}/etc/grass_write_ascii.style
+%dir %{_libdir}/grass-%{version}/etc/gui
+%{_libdir}/grass-%{version}/etc/gui/icons
+%dir %{_libdir}/grass-%{version}/etc/gui/menus
+%attr(755,root,root) %{_libdir}/grass-%{version}/etc/gui/menus/menu.tcl
 %{_libdir}/grass-%{version}/etc/gtcltk
 %dir %{_libdir}/grass-%{version}/etc/msgs
+%lang(cs) %{_libdir}/grass-%{version}/etc/msgs/cs.msg
+%lang(de) %{_libdir}/grass-%{version}/etc/msgs/de.msg
+%lang(fr) %{_libdir}/grass-%{version}/etc/msgs/fr.msg
+%lang(it) %{_libdir}/grass-%{version}/etc/msgs/it.msg
+%lang(ja) %{_libdir}/grass-%{version}/etc/msgs/ja.msg
+%lang(pl) %{_libdir}/grass-%{version}/etc/msgs/pl.msg
+%lang(pt_BR) %{_libdir}/grass-%{version}/etc/msgs/pt_br.msg
 %lang(ru) %{_libdir}/grass-%{version}/etc/msgs/ru.msg
+%lang(tr) %{_libdir}/grass-%{version}/etc/msgs/tr.msg
+%lang(vi) %{_libdir}/grass-%{version}/etc/msgs/vi.msg
 %{_libdir}/grass-%{version}/etc/nad
 %dir %{_libdir}/grass-%{version}/etc/nviz2.2
 %{_libdir}/grass-%{version}/etc/nviz2.2/bitmaps
@@ -215,12 +251,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/grass-%{version}/etc/nviz2.2/scripts/[!ns]*
 %attr(755,root,root) %{_libdir}/grass-%{version}/etc/nviz2.2/scripts/nviz2.2_script
 %{_libdir}/grass-%{version}/etc/nviz2.2/scripts/nviz_init.tcl
+%{_libdir}/grass-%{version}/etc/nviz2.2/scripts/nviz_params
 %{_libdir}/grass-%{version}/etc/nviz2.2/scripts/s[!c]*
 %{_libdir}/grass-%{version}/etc/nviz2.2/scripts/script_support.tcl
 %attr(755,root,root) %{_libdir}/grass-%{version}/etc/nviz2.2/scripts/script_[!s]*
 %{_libdir}/grass-%{version}/etc/ogr_csv
 %dir %{_libdir}/grass-%{version}/etc/paint
+%{_libdir}/grass-%{version}/etc/paint/patterns
 %{_libdir}/grass-%{version}/etc/paint/prolog.ps
+%attr(755,root,root) %{_libdir}/grass-%{version}/etc/prompt.sh
 %attr(755,root,root) %{_libdir}/grass-%{version}/etc/water
 %{_libdir}/grass-%{version}/etc/FIPS.code
 %{_libdir}/grass-%{version}/etc/VERSION*
@@ -251,5 +290,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/grass60
+%{_includedir}/grass62
 %{_libdir}/*.a