rpms/setools/FC-5 apol.png, NONE, 1.1 seaudit.png, NONE, 1.1 sediffx.png, NONE, 1.1 apol.desktop, 1.3, 1.4 seaudit.desktop, 1.3, 1.4 sediffx.desktop, 1.2, 1.3 setools-rhat.patch, 1.20, 1.21 setools.spec, 1.51, 1.52
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 11 13:38:41 UTC 2006
- Previous message (by thread): 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
- Next message (by thread): rpms/autofs/FC-5 autofs.spec,1.76,1.77
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/dist/rpms/setools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15948
Modified Files:
apol.desktop seaudit.desktop sediffx.desktop
setools-rhat.patch setools.spec
Added Files:
apol.png seaudit.png sediffx.png
Log Message:
Index: apol.desktop
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/apol.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apol.desktop 14 Dec 2005 14:47:13 -0000 1.3
+++ apol.desktop 11 Apr 2006 13:38:37 -0000 1.4
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=APOL
+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/FC-5/seaudit.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seaudit.desktop 14 Dec 2005 14:47:13 -0000 1.3
+++ seaudit.desktop 11 Apr 2006 13:38:37 -0000 1.4
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=seaudit
+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/FC-5/sediffx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sediffx.desktop 14 Dec 2005 14:47:13 -0000 1.2
+++ sediffx.desktop 11 Apr 2006 13:38:37 -0000 1.3
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=sediffx
-GenericName=SELinux Policy Difference too
+Name=SELinux Policy Difference
+GenericName=SELinux Policy Difference tool
Comment=This tool allows you to compare two policy files
Exec=/usr/bin/sediffx
Type=Application
@@ -9,3 +9,4 @@
Categories=Application;SystemSetup;X-Red-Hat-Base;
X-Desktop-File-Install-Version=0.2
StartupNotify=true
+Icon=sediffx.png
setools-rhat.patch:
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: setools-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/setools-rhat.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- setools-rhat.patch 31 Jan 2006 21:25:24 -0000 1.20
+++ setools-rhat.patch 11 Apr 2006 13:38:37 -0000 1.21
@@ -1,14 +1,3 @@
---- setools-2.3/apol/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500
-+++ setools-2.3/apol/Makefile 2006-01-31 16:15:53.000000000 -0500
-@@ -85,7 +85,7 @@
- $(MAKE) -C .. libsefs
-
- install: apol apol.tcl
-- install -m 755 apol $(BINDIR)
-+ install -m 755 apol $(SBINDIR)
- @if [ -n $(INSTALL_LIBDIR) ]; then \
- for file in $(TCL-FILES); do \
- if [ -f $(INSTALL_LIBDIR)/$$file ]; then \
--- setools-2.3/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500
+++ setools-2.3/Makefile 2006-01-31 16:18:43.000000000 -0500
@@ -12,7 +12,7 @@
@@ -29,15 +18,3 @@
# all apps that have a te/fc file need to be listed here
POLICYINSTALLDIRS =
# Help files here
---- setools-2.3/sediff/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500
-+++ setools-2.3/sediff/Makefile 2006-01-31 16:15:53.000000000 -0500
-@@ -22,7 +22,8 @@
- install -m 644 ../man/sediff.1 $(MANDIR)/man1
-
- install: all
-- install -m 755 sediff sediffx $(BINDIR);
-+ install -m 755 sediff $(BINDIR);
-+ install -m 755 sediffx $(SBINDIR);
- install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
- install -m 644 sediff_help.txt $(INSTALL_HELPDIR)
-
Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/FC-5/setools.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- setools.spec 11 Feb 2006 05:41:11 -0000 1.51
+++ setools.spec 11 Apr 2006 13:38:37 -0000 1.52
@@ -1,18 +1,19 @@
Summary: SELinux tools for managing policy
Name: setools
Version: 2.3
-Release: 1.2
+Release: 3.FC5
License: GPL
Group: System Environment/Base
URL: http://www.tresys.com/
Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
Source1: setools.pam
-Source2: apol.console
Source4: seaudit.console
Source5: apol.desktop
Source7: seaudit.desktop
-Source8: sediffx.console
Source9: sediffx.desktop
+Source10: seaudit.png
+Source11: apol.png
+Source12: sediffx.png
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,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}
@@ -95,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
@@ -105,21 +108,19 @@
rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/replcon.1
rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/findcon.1
install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sediffx
install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps
-install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol
install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
-install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx
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 apol
ln -sf consolehelper seaudit
-ln -sf consolehelper sediffx
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -129,9 +130,7 @@
%dir /usr/share/tcl8.4/BWidget-1.7.0
/usr/share/tcl8.4/BWidget-1.7.0/*
%{_bindir}/apol
-%{_sbindir}/apol
%{_bindir}/sediffx
-%{_sbindir}/sediffx
%{_bindir}/awish
%{_bindir}/seaudit
%{_sbindir}/seaudit
@@ -139,12 +138,8 @@
%{_datadir}/applications/apol.desktop
%{_datadir}/applications/seaudit.desktop
%{_datadir}/applications/sediffx.desktop
-%config(noreplace) %{_sysconfdir}/pam.d/apol
%config(noreplace) %{_sysconfdir}/pam.d/seaudit
-%config(noreplace) %{_sysconfdir}/pam.d/sediffx
-%config(noreplace) %{_sysconfdir}/security/console.apps/apol
%config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
-%config(noreplace) %{_sysconfdir}/security/console.apps/sediffx
/usr/share/doc/setools-%{version}/apol*
/usr/share/doc/setools-%{version}/seaudit_help.txt
/usr/share/doc/setools-%{version}/types_relation_help.txt
@@ -182,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
@@ -234,6 +232,17 @@
%{_libdir}/libsefs.so.1.2.1
%changelog
+
+* Tue Apr 11 2006 Dan Walsh <dwalsh at redhat.com> 2.3-3.FC5
+- Bump for FC5
+
+* 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
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-1.2
- bump again for double-long bug on ppc(64)
- Previous message (by thread): 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
- Next message (by thread): rpms/autofs/FC-5 autofs.spec,1.76,1.77
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list