From 1251dbfb08329440e694469f9ab25dd8fadcd8dd Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 1 Jun 2009 16:35:01 +0200
Subject: [PATCH] Fix nagioql packagename

---
 config/rootfiles/packages/nagiosql | 4 +---
 doc/packages-list.txt              | 2 ++
 lfs/nagiosql                       | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/packages/nagiosql b/config/rootfiles/packages/nagiosql
index 6301046263..f76a2fdb20 100644
--- a/config/rootfiles/packages/nagiosql
+++ b/config/rootfiles/packages/nagiosql
@@ -1,7 +1,5 @@
 #etc/nagiosql
-etc/nagiosql/.placeholder
 #etc/nagiosql/backup
-etc/nagiosql/backup/.placeholder
 #etc/nagiosql/backup/hosts
 etc/nagiosql/backup/hosts/.placeholder
 #etc/nagiosql/backup/services
@@ -402,4 +400,4 @@ usr/share/nagiosql
 #usr/share/nagiosql/templates/files/timeperiods.tpl.dat
 #usr/share/nagiosql/templates/index.tpl.htm
 #usr/share/nagiosql/templates/main.tpl.htm
-#etc/httpd/conf/vhosts.d/nagios.conf
+etc/httpd/conf/vhosts.d/nagios.conf
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7c8a621d51..bc88e8b13f 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -219,6 +219,8 @@
 * mtools-3.9.10
 * mysql-5.0.24a
 * nagios-3.0.6
+* nagiosql-303
+* nagiosql303
 * nagiosql303-
 * nano-2.0.9
 * nasm-0.98.39
diff --git a/lfs/nagiosql b/lfs/nagiosql
index d6cb0ca174..1157ee2e8f 100644
--- a/lfs/nagiosql
+++ b/lfs/nagiosql
@@ -30,8 +30,9 @@ THISAPP    = nagiosql$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/nagiosql3
-TARGET     = $(DIR_INFO)/$(THISAPP)-
-PROG       = nagiosql-
+TARGET     = $(DIR_INFO)/nagiosql-$(VER)
+
+PROG       = nagiosql
 PAK_VER    = 1
 
 DEPS       = "nagios"
-- 
2.39.2