[openscada/f11/master] ver. 0.7.0
Popkov Aleksey
aleksey2005 at fedoraproject.org
Tue Oct 26 10:15:30 UTC 2010
commit 081b4b2d6d7ff244b4835fefc9120ad21c7bcf06
Author: aleksey <aleksey at popkov.(none)>
Date: Tue Oct 26 14:22:02 2010 +0400
ver. 0.7.0
.gitignore | 1 +
openscada.spec | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
sources | 2 +-
3 files changed, 166 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfb8417..d4013b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
openscada-0.6.4.1.tar.gz
+/openscada-0.7.0.tar.gz
diff --git a/openscada.spec b/openscada.spec
index 79733c2..5c403b9 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -15,13 +15,17 @@
%bcond_without logiclevel
%bcond_without daqgate
%bcond_with icpdas
+%bcond_without opcua
+%bcond_with amrdevs
# ======== Protocol ========
%bcond_without selfsystem
+%bcond_without userprotocol
# ========= DATA BASES =====
%bcond_with firebird
%bcond_without mysql
%bcond_without dbf
%bcond_without sqlite
+%bcond_without postgresql
# =========== ARH ===========
%bcond_without dbarch
%bcond_without fsarch
@@ -29,6 +33,7 @@
%bcond_without webcfg
%bcond_without webcfgd
%bcond_without webvision
+%bcond_without webuser
# ========== HTTP Protocol =========
%bcond_without http
# ========== QT Interfaces ==========
@@ -67,8 +72,8 @@
Summary: Open SCADA system project
Name: openscada
-Version: 0.6.4.1
-Release: 9%{?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
@@ -82,16 +87,13 @@ ExclusiveArch: %{ix86} x86_64
BuildRequires: gettext
BuildRequires: gd-devel
BuildRequires: expat-devel
-BuildRequires: sqlite-devel
BuildRequires: byacc
BuildRequires: bison
-BuildRequires: portaudio-devel
%if 0%{?rhel}
BuildRequires: qt4-devel
%else
BuildRequires: qt-devel
%endif
-BuildRequires: lm_sensors-devel
BuildRequires: openssl-devel
BuildRequires: fftw-devel
BuildRequires: autoconf
@@ -101,6 +103,8 @@ BuildRequires: desktop-file-utils
BuildRequires: sed
BuildRequires: chrpath
BuildRequires: net-snmp-devel
+BuildRequires: glibc-devel
+BuildRequires: gcc-c++
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -202,6 +206,7 @@ Protokolle Modbus/TCP, Modbus/RTU и Modbus/ASCII.
%package DAQ-Soundcard
Summary: Open SCADA DAQ
Group: Applications/Engineering
+BuildRequires: portaudio-devel
Requires: %{name} = %{version}-%{release}
%description DAQ-Soundcard
The %name-DAQ-Soundcard allows access to sound card data.
@@ -257,6 +262,7 @@ Protokolls und der Bibliothek Libnodave für Anderes.
%package DAQ-System
Summary: Open SCADA DAQ
Group: Applications/Engineering
+BuildRequires: lm_sensors-devel
Requires: %{name} = %{version}-%{release}
%description DAQ-System
The %name-DAQ-System, allow operation system data acquisition.
@@ -394,6 +400,55 @@ Das Paket %name-Protocol-SelfSystem, das eigene OpenSCADA -
Protokoll, unterstützt die Hauptfunktionen
%endif
+%if 0%{?with_userprotocol}
+%package Protocol-UserProtocol
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description Protocol-UserProtocol
+The %{name}-Protocol-UserProtocol package - allow creation self-user
+protocols on any OpenSCADA language.
+%description Protocol-UserProtocol -l ru_RU.UTF8
+Пакет %{name}-Protocol-UserProtocol - позволяет создавать
+собственные пользовательские протоколы на любом OpenSCADA языке.
+%description Protocol-UserProtocol -l uk_UA.UTF8
+Пакет %{name}-Protocol-UserProtocol - дозволяє створювати власні
+протоколи користувача на будьякій мові OpenSCADA.
+%description Protocol-UserProtocol -l de_DE.UTF8
+Das Paket %{name}-Protocol-UserProtocol - ermöglicht das Schaffen der
+eigenen Usersprotokolle in jeder OpenSCADA - Sprache.
+%endif
+
+%if 0%{?with_opcua}
+%package DAQ-OpcUa
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-OpcUa
+The %name-DAQ-OpcUa, package allow realisation of OPC UA protocol.
+%description DAQ-OpcUa -l ru_RU.UTF8
+Пакет %name-DAQ-OpcUa, предоставляет реализацию OPC UA протокола.
+%description DAQ-OpcUa -l uk_UA.UTF8
+Пакет %name-DAQ-OpcUa,надає реалізацію OPC UA протокола.
+%description DAQ-OpcUa -l de_DE.UTF8
+Das Paket %name-DAQ-OpcUa gewährt den Einsatz des OPC UA -Protokolls
+%endif
+
+%if 0%{?with_amrdevs}
+%package DAQ-AMRDevs
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-AMRDevs
+The %name-DAQ-AMRDevs.
+%description DAQ-AMRDevs -l ru_RU.UTF8
+Пакет %name-DAQ-AMRDevs.
+%description DAQ-AMRDevs -l uk_UA.UTF8
+Пакет %name-DAQ-AMRDevs.
+%description DAQ-AMRDevs -l de_DE.UTF8
+Das Paket %name-DAQ-AMRDevs.
+%endif
+
########################### BD-System ############################
%if 0%{?with_firebird}
%package DB-FireBird
@@ -450,6 +505,7 @@ Versionen 3.0.
%package DB-SQLite
Summary: Open SCADA bases
Group: Applications/Engineering
+BuildRequires: sqlite-devel
Requires: %{name} = %{version}-%{release}
%description DB-SQLite
The %name-DB-SQLite package allow support of the BD SQLite.
@@ -461,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
@@ -582,6 +654,25 @@ Das Paket %name-UI-WebVision, web-Arbeitsnutzersinterface für die
Ausführung visueller Kontrollebereiche.
%endif
+%if 0%{?with_webuser}
+%package UI-WebUser
+Summary: Open SCADA interfaces
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-WebUser
+The %name-UI-WebUser web operation user interface for visual
+control area (VCA) projects playing.
+%description UI-WebUser -l ru_UA.UTF8
+Пакет %name-UI-WebUser, web рабочий пользовательский интерфейс
+для исполнения визуальных сред управления (СВУ)
+%description UI-WebUser -l uk_RU.UTF8
+Пакет %name-UI-WebUser, web робочий інтерфейс користувача для
+виконання візуального середовища керування (СВК).
+%description UI-WebUser -l de_DE.UTF8
+Das Paket %name-UI-WebUser, web Arbeitsnutzersinterface
+%endif
+
+
%if 0%{?with_http}
%package Protocol-HTTP
Summary: Open SCADA http
@@ -912,6 +1003,12 @@ Requires:%{name}-DAQ-Gate = %{version}-%{release}
%if 0%{?with_icpdas}
Requires:%{name}-DAQ-IcpDas = %{version}-%{release}
%endif
+%if 0%{?with_opcua}
+Requires:%{name}-DAQ-OpcUa = %{version}-%{release}
+%endif
+%if 0%{?with_amrdevs}
+Requires:%{name}-DAQ-AMRDevs = %{version}-%{release}
+%endif
# ############### HTTP ########################
%if 0%{?with_http}
Requires:%{name}-Protocol-HTTP = %{version}-%{release}
@@ -920,6 +1017,9 @@ Requires:%{name}-Protocol-HTTP = %{version}-%{release}
%if 0%{?with_selfsystem}
Requires:%{name}-Protocol-SelfSystem = %{version}-%{release}
%endif
+%if 0%{?with_userprotocol}
+Requires:%{name}-Protocol-UserProtocol = %{version}-%{release}
+%endif
# ############### Transport ########################
%if 0%{?with_sockets}
Requires:%{name}-Transport-Sockets = %{version}-%{release}
@@ -953,6 +1053,9 @@ Requires:%{name}-UI-WebCfgd = %{version}-%{release}
%if 0%{?with_webvision}
Requires:%{name}-UI-WebVision = %{version}-%{release}
%endif
+%if 0%{?with_webuser}
+Requires:%{name}-UI-WebUser = %{version}-%{release}
+%endif
%description demo
The %{name}-demo package includes demo data bases and configs.
For start use command <openscada_demo>. For access use account
@@ -1014,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
@@ -1062,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
@@ -1114,9 +1219,11 @@ 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} \
+%{!?with_webuser:--disable-WebUser} \
%{!?with_http:--disable-HTTP} \
%{!?with_modbus:--disable-ModBus} \
%{!?with_soundcard:--disable-SoundCard} \
@@ -1136,7 +1243,10 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
%{!?with_logiclevel:--disable-LogicLev} \
%{!?with_daqgate:--disable-DAQGate} \
%{!?with_icpdas:--disable-ICP_DAS} \
+%{!?with_opcua:--disable-OPC_UA} \
+%{!?with_amrdevs:--disable-AMRDevs} \
%{!?with_selfsystem:--disable-SelfSystem} \
+%{!?with_userprotocol:--disable-UserProtocol} \
%{!?with_flibcomplex:--disable-FLibComplex1} \
%{!?with_flibmath:--disable-FLibMath} \
%{!?with_flibsys:-disable-FlibSYS} \
@@ -1223,16 +1333,21 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%{?with_logiclevel: %exclude %{_libdir}/openscada/daq_LogicLev.so}
%{?with_daqgate: %exclude %{_libdir}/openscada/daq_DAQGate.so}
%{?with_icpdas: %exclude %{_libdir}/openscada/daq_ICP_DAS.so}
+%{?with_opcua: %exclude %{_libdir}/openscada/daq_OPC_UA.so}
+%{?with_amrdevs: %exclude %{_libdir}/openscada/daq_AMRDevs.so}
%{?with_selfsystem: %exclude %{_libdir}/openscada/prot_SelfSystem.so}
+%{?with_userprotocol: %exclude %{_libdir}/openscada/prot_UserProtocol.so}
%{?with_firebird: %exclude %{_libdir}/openscada/bd_FireBird.so}
%{?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}
%{?with_webcfgd: %exclude %{_libdir}/openscada/ui_WebCfgD.so}
%{?with_webvision: %exclude %{_libdir}/openscada/ui_WebVision.so}
+%{?with_webuser: %exclude %{_libdir}/openscada/ui_WebUser.so}
%{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
%{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
@@ -1336,12 +1451,30 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%{_libdir}/openscada/daq_ICP_DAS.so
%endif
+%if 0%{?with_opcua}
+%files DAQ-OpcUa
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_OPC_UA.so
+%endif
+
+%if 0%{?with_amrdevs}
+%files DAQ-AMRDevs
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_AMRDevs.so
+%endif
+
%if 0%{?with_selfsystem}
%files Protocol-SelfSystem
%defattr(-,root,root)
%{_libdir}/openscada/prot_SelfSystem.so
%endif
+%if 0%{?with_userprotocol}
+%files Protocol-UserProtocol
+%defattr(-,root,root)
+%{_libdir}/openscada/prot_UserProtocol.so
+%endif
+
%if 0%{?with_firebird}
%files DB-FireBird
%defattr(-,root,root)
@@ -1366,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)
@@ -1396,6 +1535,12 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%{_libdir}/openscada/ui_WebVision.so
%endif
+%if 0%{?with_webuser}
+%files UI-WebUser
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_WebUser.so
+%endif
+
%if 0%{?with_http}
%files Protocol-HTTP
%defattr(-,root,root)
@@ -1489,6 +1634,20 @@ 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
+- Adding the module to self package of WebUser
+- Adding the module to self package of UserProtocol
+- Disabled the module AMRDevs (not tested).
+
* Wed Feb 17 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-9
- Fixed of dependencies in Obsoletes directives
- Change of Source0 url path.
diff --git a/sources b/sources
index c24412e..3172557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bbe6f8ec2978c205abb7671fec465c84 openscada-0.6.4.1.tar.gz
+fd09a71a709e02343f196bd43e78b2d6 openscada-0.7.0.tar.gz
More information about the scm-commits
mailing list