diff --git a/grass.spec b/grass.spec index cc1ac25..6a6c76c 100644 --- a/grass.spec +++ b/grass.spec @@ -1,6 +1,6 @@ Name: grass Version: 6.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS - Geographic Resources Analysis Support System Group: Applications/Engineering License: GPLv2 @@ -146,17 +146,17 @@ cat %{buildroot}%{_bindir}/grass63.tmp | \ 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}%{_sysconfdir}/Init.sh | \ -sed -e '/ange to wxpython as/,/fi/ {:ack N; /fi/! b ack s/tcltk/wxpython/}' \ +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 744 %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh +chmod 755 %{buildroot}%{_prefix}/grass-%{version}%{_sysconfdir}/Init.sh -# fix docs lookup path +# 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\//' \ @@ -167,6 +167,8 @@ sed -i -e 's|C_BASE="$GISBASE"|C_BASE=\"\/usr\/share\/doc\/%{name}-%{version}\/d %{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}/lib/ %{buildroot}%{_libdir} @@ -236,10 +238,13 @@ for nviz in {script_play,nviz2.2_script,script_tools,script_file_tools,script_ge %{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}/docs -# hide GISBASE into systems %{_libdir} insted, to be FHS compliant +# hide whole GISBASE into systems %{_libdir} insted, to be FHS compliant mv %{buildroot}%{_prefix}/%{name}-%{version} %{buildroot}%{_libdir}/ # fix fontpath @@ -288,6 +293,9 @@ rm -rf %{buildroot} %{_libdir}/libgrass_*.so %changelog +* Mon May 23 2008 Balint Cristian 6.3.0-3 +- bugfix initscripts permission + * Thu May 15 2008 Balint Cristian 6.3.0-2 - require swig to build