rpms/grass/F-9 grass.spec,1.17,1.18
Balint Cristian (rezso)
fedora-extras-commits at redhat.com
Mon May 26 14:28:16 UTC 2008
- Previous message (by thread): rpms/sectool/F-9 .cvsignore, 1.8, 1.9 sectool.spec, 1.9, 1.10 sources, 1.8, 1.9 sectool-0.7.4-aliases.patch, 1.1, NONE sectool-0.7.4-filesystem.patch, 1.1, NONE
- Next message (by thread): rpms/kdelibs/devel kdelibs-4.0.80-parallel_devel.patch, NONE, 1.1 kdelibs.spec, 1.326, 1.327 kdelibs-4.0.72-parallel_devel.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rezso
Update of /cvs/pkgs/rpms/grass/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24015/F-9
Modified Files:
grass.spec
Log Message:
bugfix initscripts permission
----------------------------------------------------------------------
Modified Files:
F-9/grass.spec
----------------------------------------------------------------------
Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/F-9/grass.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grass.spec 15 May 2008 11:39:35 -0000 1.17
+++ grass.spec 26 May 2008 14:27:19 -0000 1.18
@@ -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 @@
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 @@
%{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 @@
%{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 @@
%{_libdir}/libgrass_*.so
%changelog
+* Mon May 23 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-3
+- bugfix initscripts permission
+
* Thu May 15 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-2
- require swig to build
- Previous message (by thread): rpms/sectool/F-9 .cvsignore, 1.8, 1.9 sectool.spec, 1.9, 1.10 sources, 1.8, 1.9 sectool-0.7.4-aliases.patch, 1.1, NONE sectool-0.7.4-filesystem.patch, 1.1, NONE
- Next message (by thread): rpms/kdelibs/devel kdelibs-4.0.80-parallel_devel.patch, NONE, 1.1 kdelibs.spec, 1.326, 1.327 kdelibs-4.0.72-parallel_devel.patch, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list