rpms/openscada/F-13 .cvsignore, 1.4, 1.5 import.log, 1.14, 1.15 openscada.spec, 1.22, 1.23 sources, 1.4, 1.5
Popkov Aleksey
aleksey2005 at fedoraproject.org
Mon May 31 13:35:35 UTC 2010
Author: aleksey2005
Update of /cvs/pkgs/rpms/openscada/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5438/F-13
Modified Files:
.cvsignore import.log openscada.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 26 Jan 2010 12:27:53 -0000 1.4
+++ .cvsignore 31 May 2010 13:35:35 -0000 1.5
@@ -1 +1 @@
-openscada-0.6.4.1.tar.gz
+openscada-0.6.4.2.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-13/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log 17 Feb 2010 13:09:41 -0000 1.14
+++ import.log 31 May 2010 13:35:35 -0000 1.15
@@ -12,3 +12,4 @@ openscada-0_6_4_1-5_fc11:HEAD:openscada-
openscada-0_6_4_1-6_fc11:HEAD:openscada-0.6.4.1-6.fc11.src.rpm:1264754591
openscada-0_6_4_1-8_fc11:HEAD:openscada-0.6.4.1-8.fc11.src.rpm:1265007157
openscada-0_6_4_1-9_fc11:F-13:openscada-0.6.4.1-9.fc11.src.rpm:1266412179
+openscada-0_6_4_2-1_fc11:F-13:openscada-0.6.4.2-1.fc11.src.rpm:1275312995
Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-13/openscada.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- openscada.spec 17 Feb 2010 13:09:41 -0000 1.22
+++ openscada.spec 31 May 2010 13:35:35 -0000 1.23
@@ -15,8 +15,11 @@
%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
@@ -29,6 +32,7 @@
%bcond_without webcfg
%bcond_without webcfgd
%bcond_without webvision
+%bcond_without webuser
# ========== HTTP Protocol =========
%bcond_without http
# ========== QT Interfaces ==========
@@ -67,8 +71,8 @@
Summary: Open SCADA system project
Name: openscada
-Version: 0.6.4.1
-Release: 9%{?dist}
+Version: 0.6.4.2
+Release: 1%{?dist}
Source0: ftp://oscada.org.ua/OpenSCADA/0.6.4/openscada-%version.tar.gz
# Init scripts for fedora
Patch0: oscada.init.patch
@@ -82,16 +86,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 +102,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 +205,7 @@ Protokolle Modbus/TCP, Modbus/RTU и Mod
%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 +261,7 @@ Protokolls und der Bibliothek Libnodave
%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 +399,55 @@ Das Paket %name-Protocol-SelfSystem, das
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 +504,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.
@@ -582,6 +637,25 @@ Das Paket %name-UI-WebVision, web-Arbeit
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 +986,12 @@ Requires:%{name}-DAQ-Gate = %{version}-%
%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 +1000,9 @@ Requires:%{name}-Protocol-HTTP = %{versi
%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 +1036,9 @@ Requires:%{name}-UI-WebCfgd = %{version}
%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
@@ -1117,6 +1203,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
%{!?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 +1223,10 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
%{!?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,7 +1313,10 @@ desktop-file-install --dir=%{buildroot}%
%{?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}
@@ -1233,6 +1326,7 @@ desktop-file-install --dir=%{buildroot}%
%{?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 +1430,30 @@ desktop-file-install --dir=%{buildroot}%
%{_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)
@@ -1396,6 +1508,12 @@ desktop-file-install --dir=%{buildroot}%
%{_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 +1607,13 @@ desktop-file-install --dir=%{buildroot}%
%endif
%changelog
+* 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.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 26 Jan 2010 12:27:53 -0000 1.4
+++ sources 31 May 2010 13:35:35 -0000 1.5
@@ -1 +1 @@
-bbe6f8ec2978c205abb7671fec465c84 openscada-0.6.4.1.tar.gz
+c5862837c2b150f28696cf96f6b2cfb6 openscada-0.6.4.2.tar.gz
More information about the scm-commits
mailing list