[Osaas-commits] r54 - in trunk: . packaging/rpm

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2008-12-03 16:50:23 +0100 (Wed, 03 Dec 2008)
New Revision: 54

Modified:
   trunk/ChangeLog
   trunk/packaging/rpm/osaas-server-path-correction.patch
   trunk/packaging/rpm/osaas-suse10.3-gp.spec
Log:
	* packaging/rpm/osaas-suse10.3-gp.spec: adopted the config-files
	  with a %config(noreplace) entry

	* packaging/rpm/osaas-server-path-correction.patch: updated the
	  patch to cope with the latest updates about the log-level



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-02 12:11:28 UTC (rev 53)
+++ trunk/ChangeLog	2008-12-03 15:50:23 UTC (rev 54)
@@ -1,3 +1,11 @@
+2008-12-03  Stephan Holl  <stephan.holl at intevation.de>
+
+	* packaging/rpm/osaas-suse10.3-gp.spec: adopted the config-files
+	  with a %config(noreplace) entry
+
+	* packaging/rpm/osaas-server-path-correction.patch: updated the
+	  patch to cope with the latest updates about the log-level
+
 2008-12-02  Bernhard Herzog  <bh at intevation.de>
 
 	* server/osaas/http/run.py (OptionStack): Add doc-string.

Modified: trunk/packaging/rpm/osaas-server-path-correction.patch
===================================================================
--- trunk/packaging/rpm/osaas-server-path-correction.patch	2008-12-02 12:11:28 UTC (rev 53)
+++ trunk/packaging/rpm/osaas-server-path-correction.patch	2008-12-03 15:50:23 UTC (rev 54)
@@ -1,17 +1,18 @@
---- server/demo-config.xml	2008-10-21 15:32:18.000000000 +0200
-+++ server/demo-config.xml.new	2008-10-22 11:42:39.000000000 +0200
-@@ -7,11 +7,11 @@
-        HTTP server access log information.  The error log is used to log
-        errors and debug information. 
+--- server/demo-config.xml.orig	2008-12-03 17:02:15.000000000 +0100
++++ server/demo-config.xml	2008-12-03 17:02:50.000000000 +0100
+@@ -12,12 +12,12 @@
+            CRITICAL, ERROR, WARNING, INFO, DEBUG
+        Default log level is INFO.
      -->
 -  <AccessLog>/var/log/osaas-access.log</AccessLog>
 -  <ErrorLog>/var/log/osaas-error.log</ErrorLog>
 +  <AccessLog>/var/log/osaas/osaas-access.log</AccessLog>
 +  <ErrorLog>/var/log/osaas/osaas-error.log</ErrorLog>
+   <LogLevel>INFO</LogLevel>
  
    <!-- The users database file. -->
 -  <UserDB>/etc/osaas-users</UserDB>
 +  <UserDB>/etc/osaas/osaas-users</UserDB>
  
-   <!-- The database connection parameters -->
-   <DBConnection>
+   <!-- File in which to write the PID.  Useful for /etc/init.d scripts -->
+   <PidFile>/var/run/osaas.pid</PidFile>

Modified: trunk/packaging/rpm/osaas-suse10.3-gp.spec
===================================================================
--- trunk/packaging/rpm/osaas-suse10.3-gp.spec	2008-12-02 12:11:28 UTC (rev 53)
+++ trunk/packaging/rpm/osaas-suse10.3-gp.spec	2008-12-03 15:50:23 UTC (rev 54)
@@ -1,6 +1,6 @@
 %define PACKAGE_NAME osaas-server
 %define PACKAGE_VERSION 1.0.0
-%define release 2+gp
+%define release 3+gp
 %define DIST opensuse-10.3
 %define _prefix /opt/gispatcher
 %define osaasdir %{_prefix}/osaas-server  
@@ -14,7 +14,7 @@
 Source: %{PACKAGE_NAME}-%{PACKAGE_VERSION}.tar.gz
 Patch0: osaas-server-path-correction.patch
 License: See GPL.txt
-Group: FILLMEIN
+Group: Application/Development
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
 Requires: postgresql-server
@@ -112,14 +112,16 @@
 %defattr(-,root,root)
 %doc %{osaasdir}/README.txt 
 %doc %{osaasdir}/ChangeLog
-%config /etc/osaas/osaas-config.xml
-%config /etc/osaas/osaas-users
+%config(noreplace) /etc/osaas/osaas-config.xml
+%config(noreplace) /etc/osaas/osaas-users
 /etc/init.d/osaas
 /sbin/rcosaas
 %{osaasdir}/server
 %exclude  %{osaasdir}/server/test
 
 %changelog
+* Wed Dec 03 2008 Stephan Holl <stephan.holl at intevation.de>
++ set the config-files as noreplace
 * Fri Nov 21 2008 Stephan Holl <stephan.holl at intevation.de>
 - added dependency to python-psycopg2 (this is included in our repository,
   since it is not found in the base-repo for OpenSuSE 10.3