diff --git a/apol.desktop b/apol.desktop index 3f41557..5861642 100644 --- a/apol.desktop +++ b/apol.desktop @@ -2,7 +2,7 @@ Name=SELinux Policy Analysis GenericName=SELinux Policy Analysis Tool Comment=This tool can examine, search, and relate policy components and policy rules -#Icon=/usr/share/pixmaps/apol.xpm +Icon=apol.png Exec=/usr/bin/apol Type=Application Terminal=false diff --git a/apol.png b/apol.png new file mode 100644 index 0000000..68ffcb7 Binary files /dev/null and b/apol.png differ diff --git a/seaudit.desktop b/seaudit.desktop index dad401d..20ca444 100644 --- a/seaudit.desktop +++ b/seaudit.desktop @@ -2,7 +2,7 @@ Name=SELinux Audit Log Analysis GenericName=SELinux Audit Log Analysis Tool Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. -#Icon=/usr/share/pixmaps/seaudit.xpm +Icon=seaudit.png Exec=/usr/bin/seaudit Type=Application Terminal=false diff --git a/seaudit.png b/seaudit.png new file mode 100644 index 0000000..d2c3df6 Binary files /dev/null and b/seaudit.png differ diff --git a/sediffx.desktop b/sediffx.desktop index 9af51a8..a5f31fa 100644 --- a/sediffx.desktop +++ b/sediffx.desktop @@ -9,3 +9,4 @@ Encoding=UTF-8 Categories=Application;SystemSetup;X-Red-Hat-Base; X-Desktop-File-Install-Version=0.2 StartupNotify=true +Icon=sediffx.png diff --git a/sediffx.png b/sediffx.png new file mode 100644 index 0000000..bd4f6c0 Binary files /dev/null and b/sediffx.png differ diff --git a/setools.spec b/setools.spec index 3262f58..c7667a3 100644 --- a/setools.spec +++ b/setools.spec @@ -1,7 +1,7 @@ Summary: SELinux tools for managing policy Name: setools Version: 2.3 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base URL: http://www.tresys.com/ @@ -11,6 +11,9 @@ Source4: seaudit.console Source5: apol.desktop Source7: seaudit.desktop Source9: sediffx.desktop +Source10: seaudit.png +Source11: apol.png +Source12: sediffx.png Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,7 +86,7 @@ tools. %build make clean -make LIBDIR=%{_libdir} all +make INSTALL_HELPDIR=/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} all %install rm -rf ${RPM_BUILD_ROOT} @@ -93,6 +96,8 @@ mkdir -p $RPM_BUILD_ROOT/%_libdir mkdir -p $RPM_BUILD_ROOT%{_includedir}/selinux/apol mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version} mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4 +mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps + make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} LIBDIR=%{_libdir} install install-bwidget rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon @@ -110,6 +115,10 @@ install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop +install -m 664 %{SOURCE10} ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png +install -m 664 %{SOURCE11} ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png +install -m 664 %{SOURCE12} ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png + cd $RPM_BUILD_ROOT/%{_bindir}/ ln -sf consolehelper seaudit @@ -168,6 +177,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/sediffx.1.gz %{_mandir}/man8/seaudit.8.gz %{_mandir}/man8/seaudit-report.8.gz +%attr(0644,root,root) /usr/share/pixmaps/seaudit.png +%attr(0644,root,root) /usr/share/pixmaps/apol.png +%attr(0644,root,root) /usr/share/pixmaps/sediffx.png %package devel Summary: Development environment for SETools @@ -220,6 +232,11 @@ Headers, static libraries and API docs for SETools. %{_libdir}/libsefs.so.1.2.1 %changelog + +* Mon Apr 10 2006 Dan Walsh 2.3-3 +- Fix help +- Add icons + * Tue Mar 21 2006 Dan Walsh 2.3-2 - Remove console apps for sediff, sediffx and apol