[openscada/f12/master] ver. 0.7.0

[Popkov Aleksey]

commit f04f35b573e05ff37490966f66ef9b6e787e414f
Author: aleksey <aleksey at popkov.(none)>
Date:   Tue Oct 26 14:23:50 2010 +0400

    ver. 0.7.0

 .gitignore     |    1 +
 openscada.spec |   38 ++++++++++++++++++++++++++++++++++++--
 sources        |    2 +-
 3 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0b96e8..0a44f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 openscada-0.6.4.2.tar.gz
+/openscada-0.7.0.tar.gz
diff --git a/openscada.spec b/openscada.spec
index d8e904e..5c403b9 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -25,6 +25,7 @@
 %bcond_without mysql
 %bcond_without dbf
 %bcond_without sqlite
+%bcond_without postgresql
 # =========== ARH ===========
 %bcond_without dbarch
 %bcond_without fsarch
@@ -71,8 +72,8 @@
 
 Summary: Open SCADA system project
 Name: openscada
-Version: 0.6.4.2
-Release: 1%{?dist}
+Version: 0.7.0
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.4/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -516,6 +517,22 @@ The %name-DB-SQLite package allow support of the BD SQLite.
 Das Paket %name-DB-SQLite gewährt die DB SQLite - Unterstützung.
 %endif
 
+%if 0%{?with_postgresql}
+%package DB-PostgreSQL
+BuildRequires: postgresql-devel
+Summary: Open SCADA bases
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DB-PostgreSQL
+The %name-DB-PostgreSQL package allow support of the BD PostgreSQL.
+%description DB-PostgreSQL -l ru_RU.UTF8
+Пакет %name-DB-PostgreSQL, предоставляет поддержку БД PostgreSQL.
+%description DB-PostgreSQL -l uk_UA.UTF8
+Пакет %name-DB-PostgreSQL, надає підтримку БД PostgreSQL.
+%description DB-PostgreSQL -l de_DE.UTF8
+Das Paket %name-DB-PostgreSQL gewährt die DB PostgreSQL - Unterstützung.
+%endif
+
 ############################# ARH-System ############################
 %if 0%{?with_dbarch}
 %package ARH-DBArch
@@ -1100,6 +1117,7 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-DB-SQLite
 Requires: %{name}-DB-MySQL
+Requires: %{name}-DB-PostgreSQL
 %if 0%{?with_firebird}
 Requires: %{name}-DB-FireBird
 %endif
@@ -1148,6 +1166,7 @@ Group: Applications/Engineering
 Requires: %name = %version-%release
 Requires: %name-DB-SQLite
 Requires: %name-DB-MySQL
+Requires: %name-DB-PostgreSQL
 Requires: %name-DAQ-System
 Requires: %name-DAQ-BlockCalc
 Requires: %name-DAQ-JavaLikeCalc
@@ -1200,6 +1219,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
 %{?with_firebird:--with-firebird=%{_libdir}/firebird} \
 %{!?with_dbf:--disable-DBF} \
 %{!?with_sqlite:--disable-SQLite} \
+%{!?with_postgresql:--disable-PostgreSQL} \
 %{!?with_webcfg:--disable-WebCfg} \
 %{!?with_webcfgd:--disable-WebCfgD} \
 %{!?with_webvision:--disable-WebVision} \
@@ -1321,6 +1341,7 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
 %{?with_mysql: %exclude %{_libdir}/openscada/bd_MySQL.so}
 %{?with_dbf: %exclude %{_libdir}/openscada/bd_DBF.so}
 %{?with_sqlite: %exclude %{_libdir}/openscada/bd_SQLite.so}
+%{?with_postgresql: %exclude %{_libdir}/openscada/bd_PostgreSQL.so}
 %{?with_dbarch: %exclude %{_libdir}/openscada/arh_DBArch.so}
 %{?with_fsarch: %exclude %{_libdir}/openscada/arh_FSArch.so}
 %{?with_webcfg: %exclude %{_libdir}/openscada/ui_WebCfg.so}
@@ -1478,6 +1499,12 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
 %{_libdir}/openscada/bd_SQLite.so
 %endif
 
+%if 0%{?with_postgresql}
+%files DB-PostgreSQL
+%defattr(-,root,root)
+%{_libdir}/openscada/bd_PostgreSQL.so
+%endif
+
 %if 0%{?with_dbarch}
 %files ARH-DBArch
 %defattr(-,root,root)
@@ -1607,6 +1634,13 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
 %endif
 
 %changelog
+* Tue Oct 26 2010 Aleksey Popkov <aleksey at oscada.org> - 0.7.0-2
+- Build the 0.7.0 version.
+
+* Thu Oct 13 2010 Aleksey Popkov <aleksey at oscada.org> - 0.7.0-2
+- Adding the module to self package of PostgreSQL servers.
+- Build the 0.7.0 version.
+
 * Mon May 17 2010 Aleksey Popkov <aleksey at oscada.org> - 0.6.4.2-1
 - RPM-build speck files is changed for build version 0.6.4.2 packages
 - Adding the module to self package of OPC_UA
diff --git a/sources b/sources
index 930732f..3172557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5862837c2b150f28696cf96f6b2cfb6  openscada-0.6.4.2.tar.gz
+fd09a71a709e02343f196bd43e78b2d6  openscada-0.7.0.tar.gz