rpms/sectool/devel .cvsignore, 1.11, 1.12 sectool.spec, 1.13, 1.14 sources, 1.11, 1.12

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/sectool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27034

Modified Files:
	.cvsignore sectool.spec sources 
Log Message:
fix conflict



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Jul 2008 10:25:08 -0000	1.11
+++ .cvsignore	24 Jul 2008 15:28:53 -0000	1.12
@@ -1 +1 @@
-sectool-0.8.0.tar.bz2
+sectool-0.8.5.tar.bz2


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sectool.spec	18 Jul 2008 13:11:26 -0000	1.13
+++ sectool.spec	24 Jul 2008 15:28:53 -0000	1.14
@@ -1,13 +1,13 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
-Version: 0.8.0
-Release: 2%{?dist}
+Version: 0.8.5
+Release: 1%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: Applications/System
 Requires: python2 gettext coreutils rpm-python
-BuildRequires: desktop-file-utils gettext intltool rpm-devel
+BuildRequires: desktop-file-utils gettext intltool rpm-devel asciidoc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package gui
@@ -42,8 +42,9 @@
   --vendor=fedora \
    $RPM_BUILD_ROOT%{_datadir}/applications/sectool.desktop
 #adjust paths in sectool.conf
-sed -i 's,TESTS_DIRS=\(.*\),TESTS_DIRS=%{_datadir}/sectool/tests,' $RPM_BUILD_ROOT%{_sysconfdir}/sectool.conf
-sed -i 's,TDATA_DIR_BASE=\(.*\),TDATA_DIR_BASE=%{_localstatedir}/lib/sectool,' $RPM_BUILD_ROOT%{_sysconfdir}/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,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
@@ -59,8 +60,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING AUTHORS README
-%config %{_sysconfdir}/sectool.conf
+%doc COPYING AUTHORS README doc/tests_documentation.html
+%config %{_sysconfdir}/sectool/
 %dir %{_localstatedir}/lib/sectool
 %dir %{_datadir}/sectool
 %{_sbindir}/sectool
@@ -91,6 +92,9 @@
 
 
 %changelog
+* Thu Jul 24 2008 Peter Vrabec <pvrabec at redhat.com> - 0.8.5-1
+- upgrade
+
 * Fri Jul 18 2008 Caolán McNamara <caolanm at redhat.com> - 0.8.0-2
 - rebuild for new rpm
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Jul 2008 10:25:08 -0000	1.11
+++ sources	24 Jul 2008 15:28:53 -0000	1.12
@@ -1 +1 @@
-f6d96b2fff95ca973914f9a911848e19  sectool-0.8.0.tar.bz2
+3e155945378b8c44ea0bff85fb66f38b  sectool-0.8.5.tar.bz2