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

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2010-10-25 12:51:50 +0200 (Mon, 25 Oct 2010)
New Revision: 79

Added:
   trunk/packaging/rpm/HowTo-Build-RPM.txt
Modified:
   trunk/ChangeLog
   trunk/packaging/rpm/osaas-suse10.3-gp.spec
Log:
Added a contrib rpm subpackage for the contrib/billing stuff

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-25 10:42:10 UTC (rev 78)
+++ trunk/ChangeLog	2010-10-25 10:51:50 UTC (rev 79)
@@ -1,5 +1,13 @@
 2010-10-25  Bjoern Schilberg <bjoern.schilberg at intevation.de>
 
+	* packaging/rpm/osaas-suse10.3-gp.spec: Added a contrib subpackage
+	  which includes the contrib/billing stuff. This contrib package gathers data
+	  about requests made to WFS servers to support billing and statistic.
+	* packaging/rpm/HowTo-Build-RPM.txt: Added a howto for how to build a osaas
+	  server rpm package.
+
+2010-10-25  Bjoern Schilberg <bjoern.schilberg at intevation.de>
+
 	* contrib/billing/GPL.txt,
 	  contrib/billing/billing.py: Changed license from LGPL to GPL. 
 

Added: trunk/packaging/rpm/HowTo-Build-RPM.txt
===================================================================
--- trunk/packaging/rpm/HowTo-Build-RPM.txt	2010-10-25 10:42:10 UTC (rev 78)
+++ trunk/packaging/rpm/HowTo-Build-RPM.txt	2010-10-25 10:51:50 UTC (rev 79)
@@ -0,0 +1,7 @@
+This howto just contains the very basics. There is no
+real release procedure or management established yet.
+
+Create a rpm package:
+
+rpmbuild -ba osaas-suse10.3-gp.spec --target noarch 2>&1 | tee osaas_rpmbuild.log
+

Modified: trunk/packaging/rpm/osaas-suse10.3-gp.spec
===================================================================
--- trunk/packaging/rpm/osaas-suse10.3-gp.spec	2010-10-25 10:42:10 UTC (rev 78)
+++ trunk/packaging/rpm/osaas-suse10.3-gp.spec	2010-10-25 10:51:50 UTC (rev 79)
@@ -1,34 +1,46 @@
 %define PACKAGE_NAME osaas-server
-%define PACKAGE_VERSION 1.0.0
+%define PACKAGE_VERSION 1.0.1
 %define release 5+gp
-%define DIST opensuse-10.3
 %define _prefix /opt/gispatcher
 %define osaasdir %{_prefix}/osaas-server  
 %define TARGET_DIR $RPM_BUILD_ROOT%{osaasdir}
 
-Summary: OSAAS is an OGC Statistics And Accounting System. It gathers data about requests made to WMS/WFS servers to support billing and statistic.
+Summary: OSAAS is an OGC Statistics And Accounting System
 Name: %{PACKAGE_NAME}
 Version: %{PACKAGE_VERSION}
 Release: %{release}
-Distribution: %{DIST}
 Source: %{PACKAGE_NAME}-%{PACKAGE_VERSION}.tar.gz
 #Patch0: osaas-server-path-correction.patch
 License: See GPL.txt
 Group: Application/Development
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
+Requires: postgresql
 Requires: postgresql-server
+Requires: python >= 2.3
 Requires: python-psycopg2
-Requires: postgresql
-Requires: python >= 2.3
-Vendor: Intevation GmbH <info at intevation.de>
-Packager: Stephan Holl <stephan.holl at intevation.de>
+Requires: python-lxml
 Url: http://osaas.wald.intevation.org
 
 %description
 OSAAS is an OGC Statistics And Accounting System. It gathers data
 about requests made to WMS/WFS servers to support billing and statistic.
 
+%package contrib
+Summary: OSAAS is an OGC Statistics And Accounting System
+Group: Application/Development
+License: See GPL.txt
+Requires: postgresql
+Requires: postgresql-server
+Requires: python >= 2.3
+Requires: python-psycopg2
+Requires: python-lxml
+Url: http://osaas.wald.intevation.org
+
+%description contrib 
+OSAAS is an OGC Statistics And Accounting System. This contrib package gathers data
+about requests made to WFS servers to support billing and statistic.
+
 %prep
 %setup -q
 #%patch0
@@ -44,7 +56,10 @@
 cp ChangeLog %{TARGET_DIR}
 cp README.txt %{TARGET_DIR}
 
+# copy contrib/billing stuff to install
 
+cp --parents -r contrib/billing %{TARGET_DIR}
+
 # do some linking
 install -d $RPM_BUILD_ROOT/etc/osaas
 ln -s %{osaasdir}/server/demo-config.xml $RPM_BUILD_ROOT/etc/osaas/osaas-config.xml
@@ -119,7 +134,19 @@
 %{osaasdir}/server
 %exclude  %{osaasdir}/server/test
 
+%files contrib 
+%{osaasdir}/contrib
+
 %changelog
+* Thu Oct 25 2010 Bjoern Schilberg <bjoern.schilberg at intevation.de> - 1.0.1
+- Added an sql script that creates a table for storing wfs requests
+  (#Issue176).
+- Added a python script that looks for WFS-GetFeature requests stored in the
+  osaas database table requests and updates the number of features returned by
+  the specific request of the entries.
+- Added an additional script for the wfs_requests.sql script - it adds a new
+  column 'billtime' that saves the time when the billing.py script has been
+  executed.
 * Mon Mar 22 2010 Stephan Holl <stephan.holl at intevation.de>
 - Implemented logging of request-durations (#Issue94). This requires
   updating the database-schema of current releases depending on used
@@ -141,4 +168,3 @@
 - removed user-deletion after uninstall
 * Tue Oct 21 2008 Stephan Holl <stephan.holl at intevation.de>
 - initial creation of this spec-file
-