[openvas-manager] bump to version 2.0.4

[rebus]

commit 765d8134d4883246d0ebefe7d418d581f6afcf8e
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Tue Jan 24 04:20:08 2012 +0100

    bump to version 2.0.4

 .gitignore            |    1 +
 openvas-manager.initd |   14 +++++++-------
 openvas-manager.spec  |   44 ++++++++++++--------------------------------
 sources               |    2 +-
 4 files changed, 21 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf06057..9c44f12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /openvas-manager-2.0.2.tar.gz
 /openvas-manager-2.0.3.tar.gz
+/openvas-manager-2.0.4.tar.gz
diff --git a/openvas-manager.initd b/openvas-manager.initd
index 92caeb1..9ac179f 100644
--- a/openvas-manager.initd
+++ b/openvas-manager.initd
@@ -54,16 +54,16 @@ start() {
 	esac
 
 
-	if [ ! -f /etc/pki/openvas/private/CA/serverkey.pem  ]; then
-		echo "Missing client certificate to connect openvas-administrator to openvas-manager."
-		echo "Try running: openvas-mkcert-client -n om -i"
-		exit 6
+	if [ ! -f /etc/pki/openvas/private/CA/clientkey.pem  ]; then
+		logger --tag "$progname" "Missing client certificate to connect openvas-administrator to openvas-manager."
+		logger --tag "$progname" "Try running: openvas-mkcert-client -n om -i"
+		exit 1
 	fi
 
 	if [ ! -f /var/lib/openvas/mgr/tasks.db  ]; then
-		echo "Missing local NVT cache database."
-		echo "Try running: openvasmd --rebuild"
-		exit 6
+		logger --tag "$progname" "Missing local NVT cache database."
+		logger --tag "$progname" "Try running: openvasmd --rebuild"
+		exit 2
 	fi
 
 	echo "Starting $progname:"
diff --git a/openvas-manager.spec b/openvas-manager.spec
index 4e24b79..2cb82e3 100644
--- a/openvas-manager.spec
+++ b/openvas-manager.spec
@@ -1,12 +1,12 @@
 Name:		openvas-manager
 Summary:	Manager Module for the Open Vulnerability Assessment System (OpenVAS)
-Version:	2.0.3
-Release:	2%{?dist}
+Version:	2.0.4
+Release:	1%{?dist}
 URL:		http://www.openvas.org
 License:	GPLv2+
 Group:		System Environment/Libraries
 
-Source0:	http://wald.intevation.org/frs/download.php/858/%{name}-%{version}.tar.gz
+Source0:	http://wald.intevation.org/frs/download.php/871/%{name}-%{version}.tar.gz
 Source1:	openvas-manager.initd
 Source2:	openvas-manager.logrotate
 Source3:	openvas-manager.sysconfig
@@ -18,33 +18,18 @@ Patch0:		openvas-manager-notused.patch
 #Not reported upstream as it is RedHat/Fedora specific
 Patch1:		openvas-manager-pki.patch
 
-#Patch to install to report templates with specified DESTDIR variabe
-Patch2:		openvas-manager-destdir.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	openvas-libraries-devel
 BuildRequires:	cmake >= 2.6.0
 BuildRequires:	glib2-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	gnutls-devel
+BuildRequires:	libuuid-devel
 BuildRequires:	libpcap-devel
 BuildRequires:	gpgme-devel
 BuildRequires:	doxygen
 BuildRequires:	pkgconfig
-# This is introduced to accomodate difference in RHEL5/CentOS5
-%if %{defined rhel}
-%if 0%{?rhel} <= 5
-#RHEL5
-BuildRequires:	e2fsprogs-libs-devel
-%else
-#RHEL6
-BuildRequires:	libuuid-devel
-%endif
-%else
-#Fedora 14 doesn't have "rhel" defined
-BuildRequires:	libuuid-devel
-%endif
-
+BuildRequires:	xmltoman
 Requires:	logrotate
 Requires:	/usr/bin/xsltproc
 
@@ -66,9 +51,8 @@ centrally stored.
 
 %prep
 %setup -q
-%patch0 -p1 -b .notused
+#%patch0 -p1 -b .notused
 %patch1 -p1 -b .pki
-%patch2 -p1 -b .destdir
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Werror=unused-but-set-variable"
@@ -132,15 +116,14 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc CHANGES COPYING README ChangeLog INSTALL TODO
+#INSTALL file contains post-installation guide for whole openvas
+%doc CHANGES COPYING README ChangeLog TODO INSTALL
 %doc doc/*.png doc/*.sql doc/*.html doc/report-format-HOWTO
 %doc report_formats
 %config(noreplace) %{_sysconfdir}/logrotate.d/openvas-manager
 %dir %{_sysconfdir}/openvas
 %dir %{_var}/lib/openvas
 %dir %{_var}/lib/openvas/mgr
-%dir %{_var}/lib/openvas/openvasmd
-%dir %{_var}/lib/openvas/openvasmd/report_formats
 %dir %{_var}/log/openvas
 %dir %{_datadir}/openvas
 %config(noreplace) %{_sysconfdir}/openvas/openvasmd_log.conf
@@ -152,14 +135,11 @@ fi
 %ghost %{_var}/log/openvas/openvasmd.log
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Apr 19 2011 Michal Ambroz <rebus at, seznam.cz> - 2.0.3-1
-- bump to bugfix release
+* Mon Jan 09 2012 Michal Ambroz <rebus at, seznam.cz> - 2.0.4-1
+- new upstream version 2.0.4
 
-* Wed Apr 14 2011 Michal Ambroz <rebus at, seznam.cz> - 2.0.2-4
-- apply BR for EL5 from openvas-scanner
+* Wed Apr 06 2011 Michal Ambroz <rebus at, seznam.cz> - 2.0.2-4
+- dependencies for F15
 
 * Wed Mar 30 2011 Michal Ambroz <rebus at, seznam.cz> - 2.0.2-3
 - implement changes based on package review
diff --git a/sources b/sources
index 1e9d775..15f4416 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36c710d0f0611fcb663f9c87d5f39186  openvas-manager-2.0.3.tar.gz
+b912c2f3620236cdf2045b23756366ab  openvas-manager-2.0.4.tar.gz