rpms/sectool/devel .cvsignore, 1.17, 1.18 sectool.spec, 1.31, 1.32 sources, 1.17, 1.18

[Maros Barabas]

Author: mbarabas

Update of /cvs/extras/rpms/sectool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23911

Modified Files:
	.cvsignore sectool.spec sources 
Log Message:
- upgrade with PolicyKit integration
- dbus update
- fedora test day bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	3 Jun 2009 10:36:16 -0000	1.17
+++ .cvsignore	9 Sep 2009 14:10:16 -0000	1.18
@@ -1 +1 @@
-sectool-0.9.3.tar.bz2
+sectool-0.9.4.tar.bz2


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sectool.spec	27 Jul 2009 04:07:18 -0000	1.31
+++ sectool.spec	9 Sep 2009 14:10:16 -0000	1.32
@@ -1,21 +1,26 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
-Version: 0.9.3
-Release: 3%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 Source1: sectool.log
 Patch1: sectool-0.9.2-optflags.patch
-Patch2: sectool-0.9.3-ext4.patch
+#Patch2: sectool-0.9.3-ext4.patch
 License: GPLv2+
 Group: Applications/System
-Requires: gettext coreutils libselinux
+Requires: gettext coreutils libselinux python-slip-dbus PolicyKit dbus
 Requires: python2 rpm-python libselinux-python glibc-headers
 BuildRequires: desktop-file-utils gettext intltool asciidoc
 BuildRequires: rpm-devel >= 4.6.0
 BuildRequires: libselinux-devel glibc-headers
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Temporarily disable check-buildroot
+#%define __arch_install_post %{nil}
+# Disable debuginfo building
+%define debug_package %{nil}
+
 %package gui
 Summary: GUI for sectool - security audit system and intrusion detection system
 License: GPLv2+
@@ -37,7 +42,7 @@ sectool-gui provides a GTK-based graphic
 %prep
 %setup -q
 %patch1 -p1 -b .optflags
-%patch2 -p1 -b .ext4
+#%patch2 -p1 -b .ext4
 
 %build
 make %{?_smp_mflags}
@@ -55,7 +60,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysc
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sectool
 #adjust paths in sectool.conf
 sed -i 's,DSC_DIR=\(.*\),DSC_DIR=%{_sysconfdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
-sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
+sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_libexecdir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
 sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool/sectool.conf
 #adjust icons path in guiOutput.py
 sed -i 's,__ico_path = \(.*\),__ico_path = "%{_datadir}/pixmaps/sectool/",' $RPM_BUILD_ROOT%{_datadir}/sectool/guiOutput.py
@@ -77,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/sectool
 #library with tests
 %{_datadir}/sectool/scheduler
-%{_datadir}/sectool/tests
+%{_libexecdir}/sectool/tests
 # command line tool
 %{_datadir}/sectool/actions.py*
 %{_datadir}/sectool/__init__.py*
@@ -85,13 +90,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sectool/mailoutput.py*
 %{_datadir}/sectool/sectool.py*
 %{_datadir}/sectool/tuierrors.py*
+%{_libexecdir}/sectool-mechanism.py*
+%{_datadir}/sectool/sectool-mechanism.py*
 %{_mandir}/man8/sectool.8.gz
-
+# PolicyKit
+%{_sysconfdir}/dbus-1/system.d/org.fedoraproject.sectool.mechanism.conf
+%{_datadir}/PolicyKit/policy/org.fedoraproject.sectool.policy
+%{_datadir}/dbus-1/system-services/org.fedoraproject.sectool.mechanism.service
 
 %files gui
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/pam.d/sectool-gui
-%config(noreplace) %{_sysconfdir}/security/console.apps/sectool-gui
+#%config(noreplace) %{_sysconfdir}/security/console.apps/sectool-gui
 %{_bindir}/sectool-gui
 %{_datadir}/sectool/gui*.py*
 %{_datadir}/sectool/sectool-gui.py*
@@ -102,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 09 2009 Maros Barabas <mbarabas at redhat.com> - 0.9.4-2
+- upgrade with PolicyKit integration
+- dbus update
+- fedora test day bugfixes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	3 Jun 2009 10:36:18 -0000	1.17
+++ sources	9 Sep 2009 14:10:16 -0000	1.18
@@ -1 +1 @@
-c159880406a54463609f60a714db22a8  sectool-0.9.3.tar.bz2
+fbd348268a8c5a5cf3004fb96a47e393  sectool-0.9.4.tar.bz2