dist-git conversion

#2781)

.cvsignore

@@ -1,13 +0,0 @@
-setools-1.4.1.tgz
-setools-1.5.tgz
-setools-1.5.1.tgz
-setools-2.0.0.tar.bz2
-setools-2.1.0.tar.bz2
-setools-2.1.1.tar.bz2
-setools-2.1.2.tar.bz2
-setools-2.1.3.tar.bz2
-setools-2.2.tar.bz2
-setools-2.3.tar.bz2
-setools-2.4.tar.bz2
-setools-3.1.tar.bz2
-setools-3.2.tar.bz2

.gitignore

@@ -0,0 +1 @@
+setools-3.3.1.tar.gz

Makefile

@@ -1,6 +0,0 @@
-# Makefile for source rpm: setools
-# $Id$
-NAME := setools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common

apol.desktop

@@ -7,6 +7,6 @@ Exec=/usr/bin/apol
 Type=Application
 Terminal=false
 Encoding=UTF-8
-Categories=Application;System;X-Red-Hat-Base;
+Categories=System;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true

seaudit.desktop

@@ -7,6 +7,6 @@ Exec=/usr/bin/seaudit
 Type=Application
 Terminal=false
 Encoding=UTF-8
-Categories=Application;System;X-Red-Hat-Base;
+Categories=System;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true

sediffx.desktop

@@ -6,7 +6,7 @@ Exec=/usr/bin/sediffx
 Type=Application
 Terminal=false
 Encoding=UTF-8
-Categories=Application;System;X-Red-Hat-Base;
+Categories=System;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true
 Icon=sediffx.png

setools.spec

@@ -1,23 +1,34 @@
+%define setools_maj_ver 3.3
+%define setools_min_ver 1
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name: setools
-Version: 3.2
-Release: 4%{?dist}
-License: GPL
+Version: %{setools_maj_ver}.%{setools_min_ver}
+Release: 7%{?dist}
+License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Source: setools-%{version}.tar.bz2
-AutoReqProv: no
+Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{version}/setools-%{version}.tar.gz
+Source1: setools.pam
+Source2: apol.desktop
+Source3: seaudit.desktop
+Source4: sediffx.desktop
 Summary: Policy analysis tools for SELinux
 Group: System Environment/Base
-Requires: setools-libs = %{version} setools-gui = %{version} setools-console = %{version}
+Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release} setools-gui = %{version}-%{release} setools-console = %{version}-%{release}
 
-# disable auto dependency generation because they are explicitly listed
-%define __find_requires %{nil}
-
-%define libqpol_ver 1.2
-%define libapol_ver 4.0
-%define libpoldiff_ver 1.2
-%define libsefs_ver 3.1
-%define libseaudit_ver 4.1
+# external requirements
+%define autoconf_ver 2.59
+%define bwidget_ver 1.8
+%define java_ver 1.2
+%define gtk_ver 2.8
+%define python_ver 2.3
+%define sepol_ver 1.12.27
+%define selinux_ver 1.30
+%define sqlite_ver 3.2.0
+%define swig_ver 1.3.28
+%define tcltk_ver 8.4.9
 
 %description
 SETools is a collection of graphical tools, command-line tools, and
@@ -27,16 +38,16 @@ This meta-package depends upon the main packages necessary to run
 SETools.
 
 %package libs
-License: LGPL
+License: LGPLv2
 Summary: Policy analysis support libraries for SELinux
 Group: System Environment/Libraries
-Requires: libselinux >= 1.30 libsepol >= 1.12.27 libxml2
-Provides: libqpol = %{libqpol_ver} libapol = %{libapol_ver} libpoldiff = %{libpoldiff_ver} libsefs = %{libsefs_ver} libseaudit = %{libseaudit_ver}
-BuildRequires: flex, bison, pkgconfig
-BuildRequires: libselinux-devel >= 1.30 libsepol-devel >= 1.12.27 libxml2-devel
-BuildRequires: tk-devel >= 8.4.9 tcl-devel >= 8.4.9
-BuildRequires: gtk2-devel >= 2.8 libglade2-devel libxml2-devel
-BuildRequires: autoconf >= 2.59 automake
+Requires: libselinux >= %{selinux_ver} libsepol >= %{sepol_ver} sqlite >= %{sqlite_ver}
+BuildRequires: flex  bison  pkgconfig
+BuildRequires: glibc-devel libstdc++-devel gcc gcc-c++
+BuildRequires: libselinux-devel >= %{selinux_ver} libsepol-devel >= %{sepol_ver}
+BuildRequires: sqlite-devel >= %{sqlite_ver} libxml2-devel
+BuildRequires: tcl-devel >= %{tcltk_ver}
+BuildRequires: autoconf >= %{autoconf_ver} automake
 
 %description libs
 SETools is a collection of graphical tools, command-line tools, and
@@ -48,15 +59,14 @@ This package includes the following run-time libraries:
   libpoldiff    semantic policy difference library
   libqpol       library that abstracts policy internals
   libseaudit    parse and filter SELinux audit messages in log files
-  libsefs       SELinux filesystem database library
+  libsefs       SELinux file contexts library
 
 %package libs-python
-License: LGPL
+License: LGPLv2
 Summary: Python bindings for SELinux policy analysis
 Group: Development/Languages
-Requires: setools-libs = %{version} python2 >= 2.3
-Provides: libqpol-python = %{libqpol_ver} libapol-python = %{libapol_ver} libpoldiff-python = %{libpoldiff_ver} libseaudit-python = %{libseaudit_ver}
-BuildRequires: python2-devel >= 2.3 swig >= 1.3.28
+Requires: setools-libs = %{version}-%{release} python2 >= %{python_ver}
+BuildRequires: python2-devel >= %{python_ver} swig >= %{swig_ver}
 
 %description libs-python
 SETools is a collection of graphical tools, command-line tools, and
@@ -68,14 +78,14 @@ This package includes Python bindings for the following libraries:
   libpoldiff    semantic policy difference library
   libqpol       library that abstracts policy internals
   libseaudit    parse and filter SELinux audit messages in log files
+  libsefs       SELinux file contexts library
 
 %package libs-java
-License: LGPL
+License: LGPLv2
 Summary: Java bindings for SELinux policy analysis
 Group: Development/Languages
-Requires: setools-libs = %{version} java >= 1.2
-Provides: libqpol-java = %{libqpol_ver} libapol-java = %{libapol_ver} libpoldiff-java = %{libpoldiff_ver} libseaudit-java = %{libseaudit_ver}
-BuildRequires: java-devel >= 1.2 swig >= 1.3.28
+Requires: setools-libs = %{version}-%{release} java >= %{java_ver}
+BuildRequires: java-devel >= %{java_ver} swig >= %{swig_ver}
 
 %description libs-java
 SETools is a collection of graphical tools, command-line tools, and
@@ -87,12 +97,33 @@ This package includes Java bindings for the following libraries:
   libpoldiff    semantic policy difference library
   libqpol       library that abstracts policy internals
   libseaudit    parse and filter SELinux audit messages in log files
+  libsefs       SELinux file contexts library
+
+%package libs-tcl
+License: LGPLv2
+Summary: Tcl bindings for SELinux policy analysis
+Group: Development/Languages
+Requires: setools-libs = %{version}-%{release} tcl >= %{tcltk_ver}
+BuildRequires: tcl-devel >= %{tcltk_ver} swig >= %{swig_ver}
+
+%description libs-tcl
+SETools is a collection of graphical tools, command-line tools, and
+libraries designed to facilitate SELinux policy analysis.
+
+This package includes Tcl bindings for the following libraries:
+
+  libapol       policy analysis library
+  libpoldiff    semantic policy difference library
+  libqpol       library that abstracts policy internals
+  libseaudit    parse and filter SELinux audit messages in log files
+  libsefs       SELinux file contexts library
 
 %package devel
-License: LGPL
+License: LGPLv2
 Summary: Policy analysis development files for SELinux
 Group: Development/Libraries
-Requires: libselinux-devel >= 1.30 libsepol-devel >= 1.12.27 libxml2-devel setools-libs = %{version}
+Requires: libselinux-devel >= %{selinux_ver} libsepol-devel >= %{sepol_ver} setools-libs = %{version}-%{release}
+BuildRequires: sqlite-devel >= %{sqlite_ver} libxml2-devel
 
 %description devel
 SETools is a collection of graphical tools, command-line tools, and
@@ -101,20 +132,18 @@ libraries designed to facilitate SELinux policy analysis.
 This package includes header files and archives for the following
 libraries:
 
-  awish         customized wish interpreter for apol development
   libapol       policy analysis library
-  libapol-tcl   bindings between apol and libapol
   libpoldiff    semantic policy difference library
   libqpol       library that abstracts policy internals
   libseaudit    parse and filter SELinux audit messages in log files
-  libsefs       SELinux filesystem database library
+  libsefs       SELinux file contexts library
 
 %package console
-AutoReqProv: no
 Summary: Policy analysis command-line tools for SELinux
 Group: System Environment/Base
-Requires: libqpol >= 1.1 libapol >= 4.0 libpoldiff >= 1.2 libsefs >= 3.1 libseaudit >= 4.0
-Requires: libselinux >= 1.30
+License: GPLv2
+Requires: setools-libs = %{version}-%{release}
+Requires: libselinux >= %{selinux_ver}
 
 %description console
 SETools is a collection of graphical tools, command-line tools, and
@@ -125,16 +154,17 @@ This package includes the following console tools:
   seaudit-report  audit log analysis tool
   sechecker       SELinux policy checking tool
   secmds          command line tools: seinfo, sesearch, findcon,
-                  replcon, indexcon, and searchcon
+                  replcon, and indexcon
   sediff          semantic policy difference tool
 
 %package gui
-AutoReqProv: no
 Summary: Policy analysis graphical tools for SELinux
 Group: System Environment/Base
-Requires: libqpol >= 1.1 libapol >= 4.0 libpoldiff >= 1.2 libsefs >= 3.0 libseaudit >= 4.1
-Requires: tcl >= 8.4.9 tk >= 8.4.9 bwidget >= 1.8
-Requires: glib2 gtk2 >= 2.8 usermode
+Requires: tcl >= %{tcltk_ver} tk >= %{tcltk_ver} bwidget >= %{bwidget_ver}
+Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release}
+Requires: glib2 gtk2 >= %{gtk_ver} usermode
+BuildRequires: gtk2-devel >= %{gtk_ver} libglade2-devel libxml2-devel tk-devel >= %{tcltk_ver}
+BuildRequires: desktop-file-utils
 
 %description gui
 SETools is a collection of graphical tools, command-line tools, and
@@ -142,232 +172,124 @@ libraries designed to facilitate SELinux policy analysis.
 
 This package includes the following graphical tools:
 
-  apol          Tcl/Tk-based policy analysis tool
+  apol          policy analysis tool
   seaudit       audit log analysis tool
   sediffx       semantic policy difference tool
 
-%define setoolsdir %{_datadir}/setools-%{version}
-%define pkgpyexecdir %{_libdir}/python?.?/site-packages/setools
-%define pkgpythondir %{_exec_prefix}/lib*/python?.?/site-packages/setools
-%define javalibdir %{_libdir}/setools
+%define setoolsdir %{_datadir}/setools-%{setools_maj_ver}
+%define pkg_py_lib %{python_sitelib}/setools
+%define pkg_py_arch %{python_sitearch}/setools
+%define javajardir %{_datadir}/java
+%define tcllibdir %{_libdir}/setools
 
 %prep
 %setup -q
 
 %build
-%configure --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java
+%configure --libdir=%{_libdir} --disable-bwidget-check --disable-selinux-check --enable-swig-python --enable-swig-java --enable-swig-tcl
 make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install
-mkdir -p ${RPM_BUILD_ROOT}/usr/share/pixmaps
+make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
-install -m 644 packages/rpm/seaudit.pam ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
+install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps
-install -m 644 packages/rpm/seaudit.console ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
+install -p -m 644 packages/rpm/seaudit.console ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
 install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications
-install -m 664 packages/rpm/apol.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
-install -m 664 packages/rpm/seaudit.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
-install -m 664 packages/rpm/sediffx.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
-install -m 664 apol/apol.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png
-install -m 664 seaudit/seaudit.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png
-install -m 664 sediff/sediffx.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png
-cd $RPM_BUILD_ROOT/%{_bindir}/
-ln -sf consolehelper seaudit
+install -p -m 644 apol/apol.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/apol.png
+install -p -m 644 seaudit/seaudit.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seaudit.png
+install -p -m 644 sediff/sediffx.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sediffx.png
+desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} %{SOURCE3} %{SOURCE4}
+ln -sf consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/seaudit
+# replace absolute symlinks with relative symlinks
+ln -sf ../setools-%{setools_maj_ver}/qpol.jar ${RPM_BUILD_ROOT}/%{javajardir}/qpol.jar
+ln -sf ../setools-%{setools_maj_ver}/apol.jar ${RPM_BUILD_ROOT}/%{javajardir}/apol.jar
+ln -sf ../setools-%{setools_maj_ver}/poldiff.jar ${RPM_BUILD_ROOT}/%{javajardir}/poldiff.jar
+ln -sf ../setools-%{setools_maj_ver}/seaudit.jar ${RPM_BUILD_ROOT}/%{javajardir}/seaudit.jar
+ln -sf ../setools-%{setools_maj_ver}/sefs.jar ${RPM_BUILD_ROOT}/%{javajardir}/sefs.jar
+# remove static libs
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.a
+# ensure permissions are correct
+chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/*.so.*
+chmod 0755 ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/*/*.so.*
+chmod 0755 ${RPM_BUILD_ROOT}/%{pkg_py_arch}/*.so.*
+chmod 0755 ${RPM_BUILD_ROOT}/%{_bindir}/*
+chmod 0755 ${RPM_BUILD_ROOT}/%{_sbindir}/*
+chmod 0755 ${RPM_BUILD_ROOT}/%{setoolsdir}/seaudit-report-service
+chmod 0644 ${RPM_BUILD_ROOT}/%{tcllibdir}/*/pkgIndex.tcl
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL KNOWN-BUGS NEWS README
+%defattr(-,root,root,-)
 
 %files libs
-%defattr(755,root,root)
-%{_libdir}/libqpol.so.%{libqpol_ver}
-%{_libdir}/libqpol.so.1
-%{_libdir}/libapol.so.%{libapol_ver}
-%{_libdir}/libapol.so.4
-%{_libdir}/libpoldiff.so.%{libpoldiff_ver}
-%{_libdir}/libpoldiff.so.1
-%{_libdir}/libsefs.so.%{libsefs_ver}
-%{_libdir}/libsefs.so.3
-%{_libdir}/libseaudit.so.%{libseaudit_ver}
-%{_libdir}/libseaudit.so.4
-%defattr(-, root, root)
-%{setoolsdir}/seaudit-report.conf
-%{setoolsdir}/seaudit-report.css
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL KNOWN-BUGS NEWS README
+%{_libdir}/libqpol.so.*
+%{_libdir}/libapol.so.*
+%{_libdir}/libpoldiff.so.*
+%{_libdir}/libsefs.so.*
+%{_libdir}/libseaudit.so.*
+%dir %{setoolsdir}
 
 %files libs-python
-%defattr(-,root,root)
-%{pkgpythondir}/__init__.py
-%{pkgpythondir}/__init__.pyc
-%{pkgpythondir}/__init__.pyo
-%{pkgpythondir}/qpol.py
-%{pkgpythondir}/qpol.pyc
-%{pkgpythondir}/qpol.pyo
-%{pkgpyexecdir}/_qpol.so.%{libqpol_ver}
-%{pkgpyexecdir}/_qpol.so.1
-%attr(755,root,root) %{pkgpyexecdir}/_qpol.so
-%{pkgpythondir}/apol.py
-%{pkgpythondir}/apol.pyc
-%{pkgpythondir}/apol.pyo
-%{pkgpyexecdir}/_apol.so.%{libapol_ver}
-%{pkgpyexecdir}/_apol.so.4
-%attr(755,root,root) %{pkgpyexecdir}/_apol.so
-%{pkgpythondir}/poldiff.py
-%{pkgpythondir}/poldiff.pyc
-%{pkgpythondir}/poldiff.pyo
-%{pkgpyexecdir}/_poldiff.so.%{libpoldiff_ver}
-%{pkgpyexecdir}/_poldiff.so.1
-%attr(755,root,root) %{pkgpyexecdir}/_poldiff.so
-%{pkgpythondir}/seaudit.py
-%{pkgpythondir}/seaudit.pyc
-%{pkgpythondir}/seaudit.pyo
-%{pkgpyexecdir}/_seaudit.so.%{libseaudit_ver}
-%{pkgpyexecdir}/_seaudit.so.4
-%attr(755,root,root) %{pkgpyexecdir}/_seaudit.so
+%defattr(-,root,root,-)
+%{pkg_py_lib}/
+%ifarch x86_64 ppc64
+%{pkg_py_arch}/
+%endif
 
 %files libs-java
-%defattr(-,root,root)
-%{_libdir}/libjqpol.so.%{libqpol_ver}
-%{_libdir}/libjqpol.so.1
-%{_libdir}/libjqpol.so
-%{_libdir}/libjapol.so.%{libapol_ver}
-%{_libdir}/libjapol.so.4
-%{_libdir}/libjapol.so
-%{_libdir}/libjpoldiff.so.%{libpoldiff_ver}
-%{_libdir}/libjpoldiff.so.1
-%{_libdir}/libjpoldiff.so
-%{_libdir}/libjseaudit.so.%{libseaudit_ver}
-%{_libdir}/libjseaudit.so.4
-%{_libdir}/libjseaudit.so
-%{javalibdir}/qpol.jar
-%{javalibdir}/apol.jar
-%{javalibdir}/poldiff.jar
-%{javalibdir}/seaudit.jar
+%defattr(-,root,root,-)
+%{_libdir}/libjqpol.so.*
+%{_libdir}/libjapol.so.*
+%{_libdir}/libjpoldiff.so.*
+%{_libdir}/libjseaudit.so.*
+%{_libdir}/libjsefs.so.*
+%{setoolsdir}/*.jar
+%{javajardir}/*.jar
+
+%files libs-tcl
+%defattr(-,root,root,-)
+%{tcllibdir}/qpol/
+%{tcllibdir}/apol/
+%{tcllibdir}/poldiff/
+%{tcllibdir}/seaudit/
+%{tcllibdir}/sefs/
 
 %files devel
-%defattr(-,root,root)
-%{_bindir}/awish
-%{_libdir}/libqpol.a
-%{_libdir}/libqpol.so
-%{_libdir}/libapol.so
-%{_libdir}/libapol.a
-%{_libdir}/libpoldiff.a
-%{_libdir}/libpoldiff.so
-%{_libdir}/libsefs.a
-%{_libdir}/libsefs.so
-%{_libdir}/libseaudit.a
-%{_libdir}/libseaudit.so
-%{_libdir}/libapol-tcl.a
-%{_includedir}/qpol/avrule_query.h
-%{_includedir}/qpol/bool_query.h
-%{_includedir}/qpol/class_perm_query.h
-%{_includedir}/qpol/cond_query.h
-%{_includedir}/qpol/constraint_query.h
-%{_includedir}/qpol/context_query.h
-%{_includedir}/qpol/fs_use_query.h
-%{_includedir}/qpol/genfscon_query.h
-%{_includedir}/qpol/isid_query.h
-%{_includedir}/qpol/iterator.h
-%{_includedir}/qpol/mls_query.h
-%{_includedir}/qpol/mlsrule_query.h
-%{_includedir}/qpol/module.h
-%{_includedir}/qpol/netifcon_query.h
-%{_includedir}/qpol/nodecon_query.h
-%{_includedir}/qpol/policy.h
-%{_includedir}/qpol/policy_extend.h
-%{_includedir}/qpol/portcon_query.h
-%{_includedir}/qpol/rbacrule_query.h
-%{_includedir}/qpol/role_query.h
-%{_includedir}/qpol/syn_rule_query.h
-%{_includedir}/qpol/terule_query.h
-%{_includedir}/qpol/type_query.h
-%{_includedir}/qpol/user_query.h
-%{_includedir}/qpol/util.h
-%{_includedir}/apol/avl-util.h
-%{_includedir}/apol/avrule-query.h
-%{_includedir}/apol/bool-query.h
-%{_includedir}/apol/bst.h
-%{_includedir}/apol/class-perm-query.h
-%{_includedir}/apol/condrule-query.h
-%{_includedir}/apol/constraint-query.h
-%{_includedir}/apol/context-query.h
-%{_includedir}/apol/domain-trans-analysis.h
-%{_includedir}/apol/fscon-query.h
-%{_includedir}/apol/infoflow-analysis.h
-%{_includedir}/apol/isid-query.h
-%{_includedir}/apol/mls-query.h
-%{_includedir}/apol/netcon-query.h
-%{_includedir}/apol/perm-map.h
-%{_includedir}/apol/policy.h
-%{_includedir}/apol/policy-path.h
-%{_includedir}/apol/policy-query.h
-%{_includedir}/apol/range_trans-query.h
-%{_includedir}/apol/rbacrule-query.h
-%{_includedir}/apol/relabel-analysis.h
-%{_includedir}/apol/render.h
-%{_includedir}/apol/role-query.h
-%{_includedir}/apol/terule-query.h
-%{_includedir}/apol/type-query.h
-%{_includedir}/apol/types-relation-analysis.h
-%{_includedir}/apol/user-query.h
-%{_includedir}/apol/util.h
-%{_includedir}/apol/vector.h
-%{_includedir}/poldiff/poldiff.h
-%{_includedir}/poldiff/attrib_diff.h
-%{_includedir}/poldiff/avrule_diff.h
-%{_includedir}/poldiff/bool_diff.h
-%{_includedir}/poldiff/cat_diff.h
-%{_includedir}/poldiff/class_diff.h
-%{_includedir}/poldiff/level_diff.h
-%{_includedir}/poldiff/range_diff.h
-%{_includedir}/poldiff/range_trans_diff.h
-%{_includedir}/poldiff/rbac_diff.h
-%{_includedir}/poldiff/role_diff.h
-%{_includedir}/poldiff/terule_diff.h
-%{_includedir}/poldiff/user_diff.h
-%{_includedir}/poldiff/type_diff.h
-%{_includedir}/poldiff/type_map.h
-%{_includedir}/poldiff/util.h
-%{_includedir}/sefs/file_contexts.h
-%{_includedir}/sefs/fsdata.h
-%{_includedir}/sefs/fshash.h
-%{_includedir}/sefs/util.h
-%{_includedir}/seaudit/avc_message.h
-%{_includedir}/seaudit/bool_message.h
-%{_includedir}/seaudit/filter.h
-%{_includedir}/seaudit/load_message.h
-%{_includedir}/seaudit/log.h
-%{_includedir}/seaudit/message.h
-%{_includedir}/seaudit/model.h
-%{_includedir}/seaudit/parse.h
-%{_includedir}/seaudit/report.h
-%{_includedir}/seaudit/sort.h
-%{_includedir}/seaudit/util.h
+%defattr(-,root,root,-)
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/qpol/
+%{_includedir}/apol/
+%{_includedir}/poldiff/
+%{_includedir}/seaudit/
+%{_includedir}/sefs/
 
 %files console
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/seinfo
 %{_bindir}/sesearch
 %{_bindir}/indexcon
 %{_bindir}/findcon
 %{_bindir}/replcon
-%{_bindir}/searchcon
 %{_bindir}/sechecker
 %{_bindir}/sediff
 %{_bindir}/seaudit-report
-%{setoolsdir}/sechecker-profiles/all-checks.sechecker
-%{setoolsdir}/sechecker-profiles/analysis-checks.sechecker
-%{setoolsdir}/sechecker-profiles/devel-checks.sechecker
-%{setoolsdir}/sechecker-profiles/sechecker.dtd
+%{setoolsdir}/sechecker-profiles/
 %{setoolsdir}/sechecker_help.txt
 %{setoolsdir}/seaudit-report-service
+%{setoolsdir}/seaudit-report.conf
+%{setoolsdir}/seaudit-report.css
 %{_mandir}/man1/findcon.1.gz
 %{_mandir}/man1/indexcon.1.gz
 %{_mandir}/man1/replcon.1.gz
-%{_mandir}/man1/searchcon.1.gz
 %{_mandir}/man1/sechecker.1.gz
 %{_mandir}/man1/sediff.1.gz
 %{_mandir}/man1/seinfo.1.gz
@@ -375,57 +297,51 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/seaudit-report.8.gz
 
 %files gui
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/seaudit
 %{_bindir}/sediffx
 %{_bindir}/apol
+%{tcllibdir}/apol_tcl/
 %{setoolsdir}/sediff_help.txt
-%{setoolsdir}/sediffx.glade
-%{setoolsdir}/sediffx.png
-%{setoolsdir}/sediffx-small.png
 %{setoolsdir}/apol_help.txt
 %{setoolsdir}/domaintrans_help.txt
 %{setoolsdir}/file_relabel_help.txt
 %{setoolsdir}/infoflow_help.txt
 %{setoolsdir}/types_relation_help.txt
-%{setoolsdir}/apol_perm_mapping_ver12
-%{setoolsdir}/apol_perm_mapping_ver15
-%{setoolsdir}/apol_perm_mapping_ver16
-%{setoolsdir}/apol_perm_mapping_ver17
-%{setoolsdir}/apol_perm_mapping_ver18
-%{setoolsdir}/apol_perm_mapping_ver19
-%{setoolsdir}/apol_perm_mapping_ver20
-%{setoolsdir}/apol_perm_mapping_ver21
-%{setoolsdir}/apol.gif
-%{setoolsdir}/apol.tcl
-%{setoolsdir}/seaudit.glade
+%{setoolsdir}/apol_perm_mapping_*
 %{setoolsdir}/seaudit_help.txt
-%{setoolsdir}/seaudit.png
-%{setoolsdir}/seaudit-small.png
+%{setoolsdir}/*.glade
+%{setoolsdir}/*.png
+%{setoolsdir}/apol.gif
 %{setoolsdir}/dot_seaudit
 %{_mandir}/man1/apol.1.gz
 %{_mandir}/man1/sediffx.1.gz
 %{_mandir}/man8/seaudit.8.gz
 %{_sbindir}/seaudit
-
 %config(noreplace) %{_sysconfdir}/pam.d/seaudit
 %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
-%{_datadir}/applications/apol.desktop
-%{_datadir}/applications/seaudit.desktop
-%{_datadir}/applications/sediffx.desktop
-%attr(0644,root,root) /usr/share/pixmaps/apol.png
-%attr(0644,root,root) /usr/share/pixmaps/seaudit.png
-%attr(0644,root,root) /usr/share/pixmaps/sediffx.png
-
-%post libs-java -p /sbin/ldconfig
-
-%postun libs-java -p /sbin/ldconfig
+%{_datadir}/applications/*
+%attr(0644,root,root) %{_datadir}/pixmaps/*.png
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
+%post libs-java -p /sbin/ldconfig
+
+%postun libs-java -p /sbin/ldconfig
+
+%post libs-tcl -p /sbin/ldconfig
+
+%postun libs-tcl -p /sbin/ldconfig
+
 %changelog
+* Thu Oct 18 2007 Chris PeBenito <cpebenito@tresys.com> 3.3.1-7.fc8
+- Rebuild to fix ppc64 issue.
+
+* Wed Oct 17 2007 Chris PeBenito <cpebenito@tresys.com> 3.3.1-6.fc8
+- Update for 3.3.1.
+
 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.2-4
 - Rebuild for selinux ppc32 issue.
 
@@ -478,31 +394,31 @@ rm -rf ${RPM_BUILD_ROOT}
 * Tue Jan 31 2006 Dan Walsh <dwalsh@redhat.com> 2.3-1
 - Update from upstream
   * apol:
-	added new MLS components tab for sensitivities, 
-	levels, and categories.
-	Changed users tab to support ranges and default 
-	levels.
-	added range transition tab for searching range
-	Transition rules.
-	added new tab for network context components.
-	added new tab for file system context components.
+        added new MLS components tab for sensitivities, 
+        levels, and categories.
+        Changed users tab to support ranges and default 
+        levels.
+        added range transition tab for searching range
+        Transition rules.
+        added new tab for network context components.
+        added new tab for file system context components.
   * libapol:
-	added binpol support for MLS, network contexts, 
-	and file system contexts.
+        added binpol support for MLS, network contexts, 
+        and file system contexts.
   * seinfo:
-	added command line options for MLS components.
-	added command line options for network contexts
-	and file system contexts.
+        added command line options for MLS components.
+        added command line options for network contexts
+        and file system contexts.
   * sesearch:
-	added command line option for searching for rules
-	by conditional boolean name.
+        added command line option for searching for rules
+        by conditional boolean name.
   * seaudit:
-	added new column in the log view for the 'comm' 
-	field found in auditd log files.
-	added filters for the 'comm' field and 'message'
-	field.
+        added new column in the log view for the 'comm' 
+        field found in auditd log files.
+        added filters for the 'comm' field and 'message'
+        field.
   * manpages:
-	added manpages for all tools.	
+        added manpages for all tools.        
 
 
 

sources

@@ -1 +1 @@
-699988ceb2d996cf172aa66bf24d7c0b  setools-3.2.tar.bz2
+d14b6c52d16016c69d2b3a7bbd7c8c50  setools-3.3.1.tar.gz