--- a/SUNWgnome-system-tools.spec Wed Jun 27 07:53:27 2007 +0000
+++ b/SUNWgnome-system-tools.spec Wed Jun 27 11:32:35 2007 +0000
@@ -24,6 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-manpages-0.1.tar.gz
Source1: %{name}-exec_attr
+Source2: %{name}-network-admin.ksh
Requires: SUNWgnome-doc-utils
Requires: SUNWgnome-config
Requires: SUNWgnome-base-libs
@@ -89,6 +90,12 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security
install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/security/exec_attr
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/inet/gnome-system-tools
+# Change to allow for addition of a network wrapper script to allow
+# for a check whether NWAM is enabled or not.
+# Move binary to /usr/lib
+mv $RPM_BUILD_ROOT/%{_bindir}/network-admin $RPM_BUILD_ROOT/%{_libdir}/network-admin
+# Now place script in to bin dir.
+install --mode=0755 %SOURCE2 $RPM_BUILD_ROOT/%{_bindir}/network-admin
#Manpages
rm -rf $RPM_BUILD_ROOT%{_mandir}
cd %{_builddir}/%name-%version/sun-manpages
@@ -164,6 +171,7 @@
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/nautilus
+%{_libdir}/network-admin
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
@@ -203,6 +211,9 @@
%config %class(rbac) %attr (0644, root, sys) %{_sysconfdir}/security/exec_attr
%changelog
+* Wed Jun 27 2007 - [email protected]
+- Fix for bug#6555581 - wrapper script for network-admin to first check
+ whether NWAM is running.
* Tue Apr 24 2007 - [email protected]
- s/0755/-/ in defattr so that files are not made all executable
* Mon Nov 20 2006 - [email protected]