rpms/setools/devel apol.png, NONE, 1.1 seaudit.png, NONE, 1.1 sediffx.png, NONE, 1.1 apol.desktop, 1.4, 1.5 seaudit.desktop, 1.4, 1.5 sediffx.desktop, 1.3, 1.4 setools.spec, 1.52, 1.53

Tue Apr 11 13:34:11 UTC 2006

Author: dwalsh

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15821

Modified Files:
	apol.desktop seaudit.desktop sediffx.desktop setools.spec 
Added Files:
	apol.png seaudit.png sediffx.png 
Log Message:



Index: apol.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/apol.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- apol.desktop	21 Mar 2006 18:40:55 -0000	1.4
+++ apol.desktop	11 Apr 2006 13:34:08 -0000	1.5
@@ -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


Index: seaudit.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/seaudit.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- seaudit.desktop	21 Mar 2006 18:40:55 -0000	1.4
+++ seaudit.desktop	11 Apr 2006 13:34:08 -0000	1.5
@@ -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


Index: sediffx.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/sediffx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sediffx.desktop	21 Mar 2006 18:40:55 -0000	1.3
+++ sediffx.desktop	11 Apr 2006 13:34:08 -0000	1.4
@@ -9,3 +9,4 @@
 Categories=Application;SystemSetup;X-Red-Hat-Base;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true
+Icon=sediffx.png


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- setools.spec	21 Mar 2006 18:40:55 -0000	1.52
+++ setools.spec	11 Apr 2006 13:34:08 -0000	1.53
@@ -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 @@
 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 @@
 
 %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%{_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 -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 @@
 %{_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 @@
 %{_libdir}/libsefs.so.1.2.1
 
 %changelog
+
+* Mon Apr 10 2006 Dan Walsh <dwalsh at redhat.com> 2.3-3
+- Fix help
+- Add icons
+
 * Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3-2
 - Remove console apps for sediff, sediffx and apol
 


