[openscada/el5] ver. 0.7.1
Popkov Aleksey
aleksey2005 at fedoraproject.org
Wed May 18 07:56:28 UTC 2011
commit 61d66c05d7b9d6d5ab16ebc6e5160a3301e01859
Author: aleksey <aleksey200505 at mail.ru>
Date: Wed May 18 11:56:01 2011 +0400
ver. 0.7.1
.gitignore | 2 +
openscada.spec | 491 ++++++++++++++++++++++++++++++++++++++------------------
sources | 3 +-
3 files changed, 337 insertions(+), 159 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3551fa..f4691d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ openscada-0.6.4.2.tar.gz
/openscada-0.7.0.tar.gz
/openscada-0.7.0.1.tar.gz
/openscada-0.7.0.2.tar.gz
+/openscada-0.7.1.tar.lzma
+/openscada-res-0.7.1.tar.lzma
diff --git a/openscada.spec b/openscada.spec
index d185349..8ac1377 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -1,6 +1,8 @@
#===== Generic Info ======
%define srcname openscada-%version
%define langmess %{_datadir}/locale
+%define _desktopdir applications
+%define _iconsdir icons
# bcond_with "--disable compiling"
# bcond_without "--enable compiling"
# ======== DAQ =========
@@ -15,8 +17,10 @@
%bcond_without javalikecalc
%bcond_without logiclevel
%bcond_without daqgate
-%bcond_with icpdas
%bcond_without opcua
+%bcond_without bfn
+
+%bcond_with icpdas
%bcond_with amrdevs
# ======== Protocol ========
%bcond_without selfsystem
@@ -39,23 +43,26 @@
%bcond_without http
# ========== QT Interfaces ==========
%bcond_without uivcaengine
+
# QT4 devel old in to CentOs
%if 0%{?rhel}
%bcond_with qtstarter
%bcond_with qtcfg
%bcond_with uivision
+%bcond_with uivcaengine
%else
%bcond_without qtstarter
%bcond_without qtcfg
%bcond_without uivision
-%define _desktopdir %_datadir/applications
-%define _iconsdir /usr/share/icons
+%bcond_without uivcaengine
+#%define _desktopdir %_datadir/applications
%endif
+
# ========== Transports ==========
%bcond_without ssl
%bcond_without sockets
%bcond_without serial
-# ========== Special ===========
+# ========== Special =============
%bcond_without flibcomplex
%bcond_without flibmath
%bcond_without flibsys
@@ -73,9 +80,10 @@
Summary: Open SCADA system project
Name: openscada
-Version: 0.7.0.2
-Release: 2%{?dist}
-Source0: ftp://oscada.org/OpenSCADA/0.7.0/openscada-%version.tar.gz
+Version: 0.7.1
+Release: 4%{?dist}
+Source0: ftp://oscada.org/OpenSCADA/0.7.1/openscada-%version.tar.lzma
+Source1: ftp://oscada.org/OpenSCADA/0.7.1/openscada-res-%version.tar.lzma
# Init scripts for fedora
Patch0: oscada.init.patch
License: GPLv2
@@ -87,7 +95,7 @@ ExclusiveArch: %{ix86} x86_64
BuildRequires: gettext
BuildRequires: gd-devel
-BuildRequires: expat-devel
+#BuildRequires: expat-devel
BuildRequires: byacc
BuildRequires: bison
%if 0%{?rhel}
@@ -107,6 +115,7 @@ BuildRequires: net-snmp-devel
BuildRequires: glibc-devel
BuildRequires: gcc-c++
BuildRequires: pcre-devel
+BuildRequires: lzma
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -383,6 +392,21 @@ Die Unterstützung von Modulen I-87000 und I-7000
und Schnell-Modulen I-8000 DCON ist eingeschlossen.
%endif
+%if 0%{?with_bfn}
+%package DAQ-Bfn
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-Bfn
+The %{name}-DAQ-Bfn package - allow realisation of BFN.
+%description DAQ-Bfn -l ru_RU.UTF8
+Пакет %{name}-DAQ-Bfn - предоставляет реализацию BFN.
+%description DAQ-Bfn -l uk_UA.UTF8
+Пакет %{name}-DAQ-Bfn - надає реалізацію BFN.
+%description DAQ-Bfn -l de_DE.UTF8
+Das Packet %{name}-DAQ-Bfn - erlauben Realisierung von BFN.
+%endif
+
%if 0%{?with_selfsystem}
%package Protocol-SelfSystem
Summary: Open SCADA Protocol
@@ -927,17 +951,50 @@ Das Paket %name-Special-SystemTests enthält die Testgruppe für das
OpenSCADA-System
%endif
-%package doc
+%package docEN
+Summary: Open SCADA documents
+Group: Documentation
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
+%description docEN
+The %name-docEN package include documents files (English).
+%description docEN -l ru_RU.UTF8
+Пакет %name-docEN включает файлы документации (Английский).
+%description docEN -l uk_UA.UTF8
+Пакет %name-docEN включає файли документації (Англійська).
+%description docEN -l de_DE.UTF8
+Das Paket %name-docEN enthält die Dokumentationsdateien (Englisch).
+
+%package docRU
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
Summary: Open SCADA documents
Group: Documentation
-%description doc
-The %name-doc package include documents files.
-%description doc -l ru_RU.UTF8
-Пакет %name-doc включает файлы документации.
-%description doc -l uk_UA.UTF8
-Пакет %name-doc включає файли документації.
-%description doc -l de_DE.UTF8
-Das Paket %name-doc enthält die Dokumentationsdateien.
+%description docRU
+The %name-docRU package include documents files (Russian).
+%description docRU -l ru_RU.UTF8
+Пакет %name-docRU включает файлы документации (Русский).
+%description docRU -l uk_UA.UTF8
+Пакет %name-docRU включає файли документації (Російська).
+%description docRU -l de_DE.UTF8
+Das Paket %name-docRU enthält die Dokumentationsdateien (Russisch).
+
+%package docUK
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
+Summary: Open SCADA documents
+Group: Documentation
+%description docUK
+The %name-docUK package include documents files (Ukraine).
+%description docUK -l ru_RU.UTF8
+Пакет %name-docUK включает файлы документации (Украинский).
+%description docUK -l uk_UA.UTF8
+Пакет %name-docUK включає файли документації (Українська).
+%description docUK -l de_DE.UTF8
+Das Paket %name-docUK enthält die Dokumentationsdateien (Ukrainisch).
%package devel
Summary: Open SCADA development
@@ -954,128 +1011,179 @@ Das Paket %name-devel enthält das Bibliothekenarchiv und die
eingeschlossenen
Dateien.
-%package demo
-Summary: Open SCADA demo data bases and config
+%package LibDB-Main
+Summary: Main OpenSCADA libraries for DAQ and other into SQLite DB.
Group: Applications/Engineering
Requires:%{name} = %{version}-%{release}
-# ############### DB ########################
-%if 0%{?with_dbarch}
-Requires:%{name}-DB-SQLite = %{version}-%{release}
-%endif
-# ############### ARH ########################
-%if 0%{?with_dbarch}
-Requires:%{name}-ARH-DBArch = %{version}-%{release}
-%endif
-%if 0%{?with_fsarch}
-Requires:%{name}-ARH-FSArch = %{version}-%{release}
-%endif
-# ############### Special ########################
-%if 0%{?with_flibmath}
-Requires:%{name}-Special-FLibMath = %{version}-%{release}
-%endif
-%if 0%{?with_flibcomplex}
-Requires:%{name}-Special-FLibComplex1 = %{version}-%{release}
-%endif
-%if 0%{?with_flibsys}
-Requires:%{name}-Special-FLibSYS = %{version}-%{release}
-%endif
-%if 0%{?with_systemtests}
-Requires:%{name}-Special-SystemTests = %{version}-%{release}
-%endif
-# ############### DAQ ########################
-%if 0%{?with_blockcalc}
-Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
-%endif
-%if 0%{?with_modbus}
-Requires:%{name}-DAQ-ModBus = %{version}-%{release}
-%endif
-%if 0%{?with_javalikecalc}
-Requires:%{name}-DAQ-JavaLikeCalc = %{version}-%{release}
-%endif
-%if 0%{?with_logiclevel}
-Requires:%{name}-DAQ-LogicLevel = %{version}-%{release}
-%endif
-%if 0%{?with_system}
-Requires:%{name}-DAQ-System = %{version}-%{release}
-%endif
-%if 0%{?with_daqgate}
-Requires:%{name}-DAQ-Gate = %{version}-%{release}
-%endif
-%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}
-%endif
-# ############### SelfSystem ########################
-%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}
-%endif
-%if 0%{?with_ssl}
-Requires:%{name}-Transport-SSL = %{version}-%{release}
-%endif
-%if 0%{?with_serial}
-Requires:%{name}-Transport-Serial = %{version}-%{release}
-%endif
-# ############### GUI System ########################
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
+%description LibDB-Main
+The %{name}-LibDB-Main package includes main OpenSCADA libraries
+into SQLite DB.
+For use connect SQLite DB file LibsDB/OscadaLibs.db.
+%description LibDB-Main -l ru_RU.UTF8
+Пакет %{name}-LibDB-Main включает основные библиотеки OpenSCADA
+в БД SQLite.
+Для использования подключите файл БД SQLite LibsDB/OscadaLibs.db.
+%description LibDB-Main -l uk_UA.UTF8
+Пакет %{name}-LibDB-Main включає основні бібліотеки OpenSCADA
+у БД SQLite.
+Для використання підключіть файл БД SQLite LibsDB/OscadaLibs.db.
+%description LibDB-Main -l de_DE.UTF8
+Das Paket %{name}-LibDB-Main enthaelt die Hauptbibliothek
+OpenSCADA die Datenbank SQLite.
+So verwenden, verbinden Sie die Datei Datenbank SQLite
+LibsDB/OscadaLibs.db.
+
+%package LibDB-VCA
+Summary: Main OpenSCADA libraries for DAQ and other into SQLite DB.
+Group: Applications/Engineering
+Requires:%{name} = %{version}-%{release}
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
+%description LibDB-VCA
+The %{name}-LibDB-VCA package includes visual components libraries
+into SQLite DB.
+For use connect SQLite DB file LibsDB/vcaBase.db and LibsDB/vcaTest.db.
+%description LibDB-VCA -l ru_RU.UTF8
+Пакет %{name}-LibDB-VCA включает библиотеки визуальных компонетов
+в БД SQLite.
+Для использования подключите файл БД SQLite LibsDB/vcaBase.db и
+LibsDB/vcaTest.db.
+%description LibDB-VCA -l uk_UA.UTF8
+Пакет %{name}-LibDB-VCA включає бібліотеки візуальних компонентів
+у БД SQLite.
+Для використання підключіть файл БД SQLite LibsDB/vcaBase.db
+та LibsDB/vcaTest.db.
+%description LibDB-VCA -l de_DE.UTF8
+Das Paket %{name}-LibDB-VCA enthaelt Visuelle Komponente in einer
+Bibliothek Datenbank SQLite.
+So verwenden, verbinden Sie die Datei Datenbank SQLite
+LibsDB/vcaBase.db und LibsDB/vcaTest.db.
+
+# ############################### Modeles ############################################
+%package Model-AGLKS
+Summary: Model "AGLKS" data bases and config (Demo: EN,RU,UK).
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-LibDB-Main = %{version}-%{release}
+Requires: %{name}-LibDB-VCA = %{version}-%{release}
+Requires: %{name}-DAQ-BlockCalc = %{version}-%{release}
+Requires: %{name}-ARH-FSArch = %{version}-%{release}
+Requires: %{name}-DAQ-JavaLikeCalc = %{version}-%{release}
+Requires: %{name}-DAQ-LogicLevel = %{version}-%{release}
+Requires: %{name}-DAQ-ModBus = %{version}-%{release}
+Requires: %{name}-DAQ-System = %{version}-%{release}
+Requires: %{name}-DB-SQLite = %{version}-%{release}
+Requires: %{name}-Protocol-HTTP = %{version}-%{release}
+Requires: %{name}-Protocol-SelfSystem = %{version}-%{release}
+Requires: %{name}-Special-FLibComplex1 = %{version}-%{release}
+Requires: %{name}-Special-FLibMath = %{version}-%{release}
+Requires: %{name}-Special-FLibSYS = %{version}-%{release}
+Requires: %{name}-Transport-SSL = %{version}-%{release}
+Requires: %{name}-Transport-Serial = %{version}-%{release}
%if 0%{?with_qtstarter}
-Requires:%{name}-UI-QTStarter = %{version}-%{release}
+Requires: %{name}-UI-QTStarter = %{version}-%{release}
%endif
%if 0%{?with_qtcfg}
-Requires:%{name}-UI-QTCfg = %{version}-%{release}
+Requires: %{name}-UI-QTCfg = %{version}-%{release}
%endif
%if 0%{?with_uivision}
-Requires:%{name}-UI-Vision = %{version}-%{release}
+Requires: %{name}-UI-Vision = %{version}-%{release}
%endif
%if 0%{?with_uivcaengine}
-Requires:%{name}-UI-VCAEngine = %{version}-%{release}
-%endif
-# ############### Web Interfaces ########################
-%if 0%{?with_webcfg}
-Requires:%{name}-UI-WebCfg = %{version}-%{release}
+Requires: %{name}-UI-VCAEngine = %{version}-%{release}
+%endif
+Requires: %{name}-UI-WebCfg = %{version}-%{release}
+Requires: %{name}-UI-WebVision = %{version}-%{release}
+
+
+%description Model-AGLKS
+The %{name}-Model-AGLKS package includes model "AGLKS" data
+bases and config.
+The Model is used for OpenSCADA demo and allowed for English, Russian
+and Ukrainian languages.
+For start use command <openscada_demo> or <openscada_AGLKS>.
+For access use account "root" and password "openscada" or account "user" and
+password "user".
+%description Model-AGLKS -l ru_RU.UTF8
+Пакет %{name}-Model-AGLKS включает БД и конфигурацию модели "АГЛКС".
+Модель используется для демонстрации OpenSCADA и доступна на Английском,
+Русском и Украинском языках.
+Для старта используйте команду <openscada_demo> мли <openscada_AGLKS>.
+Для доступа используйте запись "root" и пароль "openscada" или запись
+"user" и пароль "user".
+%description Model-AGLKS -l uk_UA.UTF8
+Пакет %{name}-Model-AGLKS включає БД та конфігурацію моделі "АГЛКС".
+Модель використано для демонстрації OpenSCADA та доступно на Англійській,
+Російській та Українській мовах.
+Для старту використовуйте команду <openscada_demo> та <openscada_AGLKS>.
+Для доступу використовуйте запис "root" та пароль "openscada" або запис
+"user" та пароль "user".
+%description Model-AGLKS -l de_DE.UTF8
+Das Paket %{name}-Model-AGLKS enthaelt Datenbanken und
+Konfigurationsdateien Modell "AGLKS".
+Das Modell wird verwendet, um OpenSCADA demonstrieren und ist verfügbar
+in Englisch, Russisch und Ukrainisch.
+Fuers Starten wird Kommando <openscada_demo> oder <openscada_AGLKS> benutzt.
+Fuer den Zugang die Aufzeichnung "root" und das Kennwort "openscada" benutzen.
+
+%package Model-Boiler
+Summary: Model "Boiler" data bases and config (only Russian).
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-LibDB-Main = %{version}-%{release}
+Requires: %{name}-LibDB-VCA = %{version}-%{release}
+Requires: %{name}-DAQ-BlockCalc = %{version}-%{release}
+Requires: %{name}-ARH-FSArch = %{version}-%{release}
+Requires: %{name}-DAQ-JavaLikeCalc = %{version}-%{release}
+Requires: %{name}-DAQ-LogicLevel = %{version}-%{release}
+Requires: %{name}-DAQ-System = %{version}-%{release}
+Requires: %{name}-Special-FLibComplex1 = %{version}-%{release}
+Requires: %{name}-Special-FLibMath = %{version}-%{release}
+Requires: %{name}-Special-FLibSYS = %{version}-%{release}
+Requires: %{name}-DB-SQLite = %{version}-%{release}
+%if 0%{?with_qtstarter}
+Requires: %{name}-UI-QTStarter = %{version}-%{release}
%endif
-%if 0%{?with_webcfgd}
-Requires:%{name}-UI-WebCfgd = %{version}-%{release}
+%if 0%{?with_qtcfg}
+Requires: %{name}-UI-QTCfg = %{version}-%{release}
%endif
-%if 0%{?with_webvision}
-Requires:%{name}-UI-WebVision = %{version}-%{release}
+%if 0%{?with_uivision}
+Requires: %{name}-UI-Vision = %{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
-"root" and password "openscada" or account "user" without password.
-%description demo -l ru_RU.UTF8
-Пакет %{name}-demo включает демонстрационные базы данных и
-конфигурации. Для старта используйте команду <openscada_demo>.
-Для доступа используйте запись "root" и пароль "openscada"
-или запись "user" без пароля.
-%description demo -l uk_UA.UTF8
-Пакет %{name}-demo включає демонстраційні бази даних та
-конфігурації. Для старту використовуйте команду <openscada_demo>.
-Для доступу використовуйте запис "root" та пароль "openscada"
-або запис "user" без пароля.
-%description demo -l de_DE.UTF8
-Das Paket %{name}-demo enthält die Demodatenbanken und
-Konfigurationen. Fürs Starten wird Kommando <openscada_demo>
-benutzt. Für den Zugang benutzen Sie die Anschreibung "root"
-und das Kennwort "openscada" oder die Anschreibung "user" ohne Kennwort.
+%if 0%{?with_uivcaengine}
+Requires: %{name}-UI-VCAEngine = %{version}-%{release}
+%endif
+Requires: %{name}-UI-WebCfg = %{version}-%{release}
+Requires: %{name}-UI-WebVision = %{version}-%{release}
+
+%description Model-Boiler
+The %{name}-Model-Boiler package model "Boiler" data bases and config.
+The Model is allowed only for Russian language.
+For start use command <openscada_Boiler>.
+For access use account "root" and password "openscada" or account
+"user" and password "user".
+%description Model-Boiler -l ru_RU.UTF8
+Пакет %{name}-Model-Boiler включает БД и конфигурацию модели "Котёл".
+Модель доступна только на Русском языке.
+Для старта используйте команду <openscada_Boiler>.
+Для доступа используйте запись "root" и пароль "openscada" или запись
+"user" и пароль "user".
+%description Model-Boiler -l uk_UA.UTF8
+Пакет %{name}-Model-Boiler включає БД та конфігурацію моделі "Котел".
+Модель доступно тільки на Російській мові.
+Для старту використовуйте команду <openscada_Boiler>.
+Для доступу використовуйте запис "root" та пароль "openscada" або запис
+"user" та пароль "user".
+%description Model-Boiler -l de_DE.UTF8
+Das Paket %{name}-Model-Boiler enthaelt Datenbanken und
+Konfigurationsdateien Modell "Kessel".
+Das Modell ist nur in Russisch verfügbar.
+Fuers Starten wird Kommando <openscada_Boiler> benutzt.
+Fuer den Zugang die Aufzeichnung "root" und das Kennwort "openscada" benutzen.
# ############################### Virtual Packages ###################################
%package plc
@@ -1103,6 +1211,9 @@ Requires: %{name}-Transport-Sockets
Requires: %{name}-UI-VCAEngine
Requires: %{name}-UI-WebCfgd
Requires: %{name}-UI-WebVision
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
%description plc
The %{name}-plc package is virtual package for PLC.
%description plc -l ru_RU.UTF8
@@ -1152,6 +1263,9 @@ Requires: %{name}-UI-WebCfgd
Requires: %{name}-Special-FLibComplex1
Requires: %{name}-Special-FLibMath
Requires: %{name}-Special-FLibSYS
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
%description server
The %name-server package is virtual package for OpenSCADA-server.
%description server -l ru_RU.UTF8
@@ -1193,8 +1307,11 @@ Requires: %name-UI-QTCfg
Requires: %name-Special-FLibComplex1
Requires: %name-Special-FLibMath
Requires: %name-Special-FLibSYS
+%if 0%{!?rhel5}
+BuildArch: noarch
+%endif
%description visStation
-The %name-visStation package is virtual package for visual
+The %name-viStation package is virtual package for visual
station (OpenSCADA).
%description visStation -l ru_RU.UTF8
Пакет %name-visStation это виртуальный пакет для визуальной
@@ -1208,9 +1325,11 @@ station (OpenSCADA).
%prep
%setup -q -n %{srcname}
+%setup -T -D -a 1
%patch0 -p1 -b .fedora
%build
+autoreconf -ifv
CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
%configure --disable-static \
%{!?with_dcon:--disable-DCON} \
@@ -1246,6 +1365,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
%{!?with_icpdas:--disable-ICP_DAS} \
%{!?with_opcua:--disable-OPC_UA} \
%{!?with_amrdevs:--disable-AMRDevs} \
+%{!?with_bfn:--disable-BFN} \
%{!?with_selfsystem:--disable-SelfSystem} \
%{!?with_userprotocol:--disable-UserProtocol} \
%{!?with_flibcomplex:--disable-FLibComplex1} \
@@ -1274,30 +1394,36 @@ rm -f %{buildroot}%{_libdir}/openscada/*.*a
%{__install} -m 644 -pD data/oscada_start.xml %{buildroot}%{_sysconfdir}/oscada_start.xml
%{__install} -m 755 -pD data/openscada_start %{buildroot}%{_bindir}/openscada_start
%{__install} -m 755 -pD data/oscada.init %{buildroot}%{_initrddir}/openscadad
-%{__install} -m 755 -d %{buildroot}/var/spool/openscada/{DATA,icons}
+%{__install} -m 755 -d %{buildroot}/var/spool/openscada/{DATA,icons,LibsDB,AGLKS,Boiler}
%{__install} -m 644 data/icons/* %{buildroot}/var/spool/openscada/icons
%{__install} -m 755 -d %{buildroot}/var/spool/openscada/ARCHIVES/{MESS,VAL}
-%{__install} -m 644 -pD demo/oscada_demo.xml %{buildroot}%{_sysconfdir}/oscada_demo.xml
-%{__install} -m 755 -pD demo/openscada_demo %{buildroot}%{_bindir}/openscada_demo
-%if 0%{?with_qtstarter}
-%{__install} -m 644 -pD demo/openscada_demo.png %{buildroot}%_iconsdir/openscada_demo.png
-%{__install} -m 644 -pD data/openscada.png %{buildroot}%_iconsdir/openscada.png
-%endif
-%{__install} -m 755 -d %{buildroot}/var/spool/openscada/DEMO
-%{__install} -m 644 demo/*.db %{buildroot}/var/spool/openscada/DEMO
+
+%{__install} -m 644 -pD data/LibsDB/*.db %{buildroot}%{_localstatedir}/spool/openscada/LibsDB
+%{__install} -m 644 data/ModelsDB/AGLKS/*.db %{buildroot}%{_localstatedir}/spool/openscada/AGLKS
+%{__install} -m 644 -pD data/ModelsDB/AGLKS/oscada_AGLKS.xml %{buildroot}%{_sysconfdir}/oscada_AGLKS.xml
+%{__install} -m 755 -pD data/ModelsDB/AGLKS/openscada_AGLKS %{buildroot}%{_bindir}/openscada_AGLKS
+%{__install} -m 644 -pD data/ModelsDB/AGLKS/openscada_AGLKS.png %{buildroot}%{_datadir}/%_iconsdir/openscada_AGLKS.png
+%{__install} -m 644 -pD data/ModelsDB/AGLKS/openscada_AGLKS.png %{buildroot}%{_localstatedir}/spool/openscada/icons/AGLKS.png
+%{__install} -m 644 -pD data/ModelsDB/AGLKS/openscada_AGLKS.desktop %{buildroot}%{_datadir}/%_desktopdir/openscada_AGLKS.desktop
+
+%{__install} -m 644 data/ModelsDB/Boiler/*.db %{buildroot}%{_localstatedir}/spool/openscada/Boiler
+%{__install} -m 644 -pD data/ModelsDB/Boiler/oscada_Boiler.xml %{buildroot}%{_sysconfdir}/oscada_Boiler.xml
+%{__install} -m 755 -pD data/ModelsDB/Boiler/openscada_Boiler %{buildroot}%{_bindir}/openscada_Boiler
+%{__install} -m 644 -pD data/ModelsDB/Boiler/openscada_Boiler.png %{buildroot}%{_datadir}/%_iconsdir/openscada_Boiler.png
+%{__install} -m 644 -pD data/ModelsDB/Boiler/openscada_Boiler.png %{buildroot}%{_localstatedir}/spool/openscada/icons/Boiler.png
+%{__install} -m 644 -pD data/ModelsDB/Boiler/openscada_Boiler.desktop %{buildroot}/%{_datadir}/%_desktopdir/openscada_Boiler.desktop
echo "OpenSCADA data dir" > %{buildroot}/var/spool/openscada/DATA/info
echo "OpenSCADA messages archive dir" > %{buildroot}/var/spool/openscada/ARCHIVES/MESS/info
echo "OpenSCADA values archive dir" > %{buildroot}/var/spool/openscada/ARCHIVES/VAL/info
+%{__sed} -i 's|/lib/openscada/|/%{_lib}/openscada/|' %{buildroot}%{_sysconfdir}/oscada*.xml
%{__sed} -i 's|/usr/lib/|%{_libdir}/|' %{buildroot}%{_sysconfdir}/oscada*.xml
%{__sed} -i 's|OPENSCADA_BIN=|OPENSCADA_BIN=%{_bindir}/openscada|' %{buildroot}%{_initrddir}/openscadad
# installation of *.desktop files
-%if 0%{?with_qtstarter}
-desktop-file-install --dir=%{buildroot}%_desktopdir data/openscada.desktop
-desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
-%endif
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/%_desktopdir data/ModelsDB/AGLKS/openscada_AGLKS.desktop
+desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/%_desktopdir data/ModelsDB/Boiler/openscada_Boiler.desktop
%find_lang o.* %{name}.lang
@@ -1325,9 +1451,6 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%exclude %{langmess}/de/LC_MESSAGES/oscd_*
%exclude %{langmess}/ru/LC_MESSAGES/oscd_*
%exclude %{langmess}/uk/LC_MESSAGES/oscd_*
-%lang(de) %{langmess}/de/LC_MESSAGES/openscada.mo
-%lang(ru) %{langmess}/ru/LC_MESSAGES/openscada.mo
-%lang(uk) %{langmess}/uk/LC_MESSAGES/openscada.mo
%{?with_diamondboards: %exclude %{_libdir}/openscada/daq_DiamondBoards.so}
%{?with_dcon: %exclude %{_libdir}/openscada/daq_DCON.so}
@@ -1343,6 +1466,7 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%{?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_bfn: %exclude %{_libdir}/openscada/daq_BFN.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}
@@ -1383,9 +1507,20 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%files visStation
%defattr(-,root,root)
-%files doc
+%files docEN
+%defattr(-,root,root)
+#%doc doc/*.pdf doc/Modules
+%doc doc/en/*
+
+%files docRU
%defattr(-,root,root)
-%doc doc/*.pdf doc/Modules
+#%doc doc/*.pdf doc/Modules
+%doc doc/ru/*
+
+%files docUK
+%defattr(-,root,root)
+#%doc doc/*.pdf doc/Modules
+%doc doc/uk/*
%if 0%{?with_diamondboards}
%files DAQ-DiamondBoards
@@ -1510,6 +1645,15 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%lang(uk) %{langmess}/uk/LC_MESSAGES/oscd_AMRDevs.mo
%endif
+%if 0%{?with_bfn}
+%files DAQ-Bfn
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_BFN.so
+%lang(de) %{langmess}/de/LC_MESSAGES/oscd_BFN.mo
+%lang(ru) %{langmess}/ru/LC_MESSAGES/oscd_BFN.mo
+%lang(uk) %{langmess}/uk/LC_MESSAGES/oscd_BFN.mo
+%endif
+
%if 0%{?with_selfsystem}
%files Protocol-SelfSystem
%defattr(-,root,root)
@@ -1640,9 +1784,9 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%files UI-QTStarter
%defattr(-,root,root)
%{_libdir}/openscada/ui_QTStarter.so
-%_desktopdir/openscada.desktop
-%_desktopdir/openscada_demo.desktop
-%_iconsdir/openscada.png
+#%_desktopdir/openscada.desktop
+#%_desktopdir/openscada_demo.desktop
+#%_iconsdir/openscada.png
%lang(de) %{langmess}/de/LC_MESSAGES/oscd_QTStarter.mo
%lang(ru) %{langmess}/ru/LC_MESSAGES/oscd_QTStarter.mo
%lang(uk) %{langmess}/uk/LC_MESSAGES/oscd_QTStarter.mo
@@ -1744,18 +1888,49 @@ desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
%{_libdir}/*.so
%{_includedir}/openscada/*
-%files demo
+%files LibDB-Main
%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/oscada_demo.xml
-%dir %{_localstatedir}/spool/openscada/DEMO
-%{_bindir}/openscada_demo
-%{_localstatedir}/spool/openscada/DEMO/*.db
-%if 0%{?with_qtstarter}
-%_desktopdir/openscada_demo.desktop
-%_iconsdir/openscada_demo.png
-%endif
+%dir %{_localstatedir}/spool/openscada/LibsDB/OscadaLibs.db
+
+%files LibDB-VCA
+%defattr(-,root,root)
+%dir %{_localstatedir}/spool/openscada/LibsDB/vca*.db
+
+%files Model-AGLKS
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/oscada_AGLKS.xml
+%{_bindir}/openscada_AGLKS
+%{_datadir}/%_desktopdir/openscada_AGLKS.desktop
+%{_datadir}/%_iconsdir/openscada_AGLKS.png
+%dir %{_localstatedir}/spool/openscada/icons/AGLKS.png
+%dir %{_localstatedir}/spool/openscada/AGLKS/*.db
+
+%files Model-Boiler
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/oscada_Boiler.xml
+%{_bindir}/openscada_Boiler
+%{_datadir}/%_desktopdir/openscada_Boiler.desktop
+%{_datadir}/%_iconsdir/openscada_Boiler.png
+%dir %{_localstatedir}/spool/openscada/icons/Boiler.png
+%dir %{_localstatedir}/spool/openscada/Boiler/*.db
%changelog
+* Thu May 17 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.1-4
+- Adding of autoreconf command.
+
+* Thu Apr 18 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.1-3
+- Updated for noarch packages enable.
+
+* Thu Apr 15 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.1-2
+- Cosmetics of file name.
+
+* Thu Apr 14 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.1-1
+- New source packages implementation is released.
+- Documentation separated by languages.
+- Libraries DB packages is added for *-LibDB-Main and *-LibDB-VCA.
+- Instead DemoDB package added Model's packages for "AGLKS" and "Boiler".
+- Adding the BFN module to self package.
+
* Wed Mar 4 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.0.2-2
- Rebuild of 0.7.0.2 version
- Fixed UI.WebVision: Function VCAElFigure::dashDotFigureBorders() realisation wrong comment is fixed.
diff --git a/sources b/sources
index 48b2da3..fc95d45 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-786b9b14dafaf10e19536513c61ede39 openscada-0.7.0.2.tar.gz
+bd14e826a6d915356d9942502b70b765 openscada-0.7.1.tar.lzma
+c59564dec6d325ed7631dee684089b0e openscada-res-0.7.1.tar.lzma
More information about the scm-commits
mailing list