[openscada/f15] ver. 0.8.0
Popkov Aleksey
aleksey2005 at fedoraproject.org
Fri Apr 13 13:37:41 UTC 2012
commit 47ec7e82235281d80cf08bacd142814e58647995
Author: aleksey <aleksey at popkov.psniip.local>
Date: Fri Apr 13 17:37:35 2012 +0400
ver. 0.8.0
openscada.spec | 136 +++++++++++++++++++++++++++++++++++++-------------------
phonon.patch | 15 ++++++
2 files changed, 105 insertions(+), 46 deletions(-)
---
diff --git a/openscada.spec b/openscada.spec
index 6781c44..b0c5977 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -2,6 +2,7 @@
%define langmess %{_datadir}/locale
%define _desktopdir applications
%define _iconsdir icons
+%define flag_el 1
# bcond_with "--disable compiling"
# bcond_without "--enable compiling"
# ======== DAQ =========
@@ -40,22 +41,21 @@
%bcond_without webuser
# ========== HTTP Protocol =========
%bcond_without http
-# ========== QT Interfaces ==========
-%bcond_without uivcaengine
-
+# ========== QT Interfaces ===== ==
# QT4 devel old in to CentOs
-%if 0%{?rhel}
+%if "%{?dist}" == ".el5"
%bcond_with qtstarter
%bcond_with qtcfg
%bcond_with uivision
%bcond_with uivcaengine
+%define flag_el 0
%else
%bcond_without qtstarter
%bcond_without qtcfg
%bcond_without uivision
%bcond_without uivcaengine
-#%define _desktopdir %_datadir/applications
%endif
+#%define _desktopdir %_datadir/applications
# ========== Transports ==========
%bcond_without ssl
@@ -80,13 +80,15 @@
Summary: Open SCADA system project
Name: openscada
Version: 0.8.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Source0: ftp://oscada.org/OpenSCADA/0.8.0/openscada-%version.tar.lzma
Source1: ftp://oscada.org/OpenSCADA/0.8.0/openscada-res-%version.tar.lzma
# Need to delete
# Init scripts for fedora
#Patch0: oscada.init.patch
-#
+# Patch for phonon
+Patch1: phonon.patch
+
License: GPLv2
Group: Applications/Engineering
URL: http://oscada.org
@@ -113,7 +115,9 @@ BuildRequires: glibc-devel
BuildRequires: gcc-c++
BuildRequires: pcre-devel
BuildRequires: lzma
-
+%if "%{?dist}" == ".el5"
+BuildRequires: buildsys-macros
+%endif
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -948,11 +952,12 @@ for OpenSCADA system.
Das Paket %name-Special-SystemTests enthält die Testgruppe für das
OpenSCADA-System
%endif
+######################### Documents-System ##############################
%package docEN
Summary: Open SCADA documents
Group: Documentation
-%if 0%{!?rhel5}
+%if 0%{?flag_el}
BuildArch: noarch
%endif
%description docEN
@@ -965,11 +970,11 @@ The %name-docEN package include documents files (English).
Das Paket %name-docEN enthält die Dokumentationsdateien (Englisch).
%package docRU
-%if 0%{!?rhel5}
-BuildArch: noarch
-%endif
Summary: Open SCADA documents
Group: Documentation
+%if 0%{?flag_el}
+BuildArch: noarch
+%endif
%description docRU
The %name-docRU package include documents files (Russian).
%description docRU -l ru_RU.UTF8
@@ -980,11 +985,11 @@ The %name-docRU package include documents files (Russian).
Das Paket %name-docRU enthält die Dokumentationsdateien (Russisch).
%package docUK
-%if 0%{!?rhel5}
-BuildArch: noarch
-%endif
Summary: Open SCADA documents
Group: Documentation
+%if 0%{?flag_el}
+BuildArch: noarch
+%endif
%description docUK
The %name-docUK package include documents files (Ukraine).
%description docUK -l ru_RU.UTF8
@@ -994,6 +999,7 @@ The %name-docUK package include documents files (Ukraine).
%description docUK -l de_DE.UTF8
Das Paket %name-docUK enthält die Dokumentationsdateien (Ukrainisch).
+######################### Devel-System ##############################
%package devel
Summary: Open SCADA development
Group: Development/Libraries
@@ -1009,13 +1015,14 @@ Das Paket %name-devel enthält das Bibliothekenarchiv und die
eingeschlossenen
Dateien.
+######################### DataBases-System ##############################
%package LibDB-Main
Summary: Main OpenSCADA libraries for DAQ and other into SQLite DB.
Group: Applications/Engineering
-Requires:%{name} = %{version}-%{release}
-%if 0%{!?rhel5}
+%if 0%{?flag_el}
BuildArch: noarch
%endif
+Requires:%{name} = %{version}-%{release}
%description LibDB-Main
The %{name}-LibDB-Main package includes main OpenSCADA libraries
into SQLite DB.
@@ -1037,10 +1044,10 @@ 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}
+%if 0%{?flag_el}
BuildArch: noarch
%endif
+Requires:%{name} = %{version}-%{release}
%description LibDB-VCA
The %{name}-LibDB-VCA package includes visual components libraries
into SQLite DB.
@@ -1187,6 +1194,9 @@ Fuer den Zugang die Aufzeichnung "root" und das Kennwort "openscada" benutzen.
%package plc
Summary: OpenSCADA PLC
Group: Applications/Engineering
+%if 0%{?flag_el}
+BuildArch: noarch
+%endif
Requires: %{name} = %{version}-%{release}
Requires: %{name}-ARH-FSArch
Requires: %{name}-DAQ-BlockCalc
@@ -1206,12 +1216,11 @@ Requires: %{name}-Special-FLibSYS
Requires: %{name}-Transport-SSL
Requires: %{name}-Transport-Serial
Requires: %{name}-Transport-Sockets
+%if 0%{?with_uivcaengine}
Requires: %{name}-UI-VCAEngine
+%endif
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
@@ -1224,6 +1233,9 @@ The %{name}-plc package is virtual package for PLC.
%package server
Summary: OpenSCADA server
Group: Applications/Engineering
+%if 0%{?flag_el}
+BuildArch: noarch
+%endif
Requires: %{name} = %{version}-%{release}
Requires: %{name}-DB-SQLite
Requires: %{name}-DB-MySQL
@@ -1254,16 +1266,15 @@ Requires: %{name}-Transport-SSL
Requires: %{name}-Transport-Serial
Requires: %{name}-Protocol-HTTP
Requires: %{name}-Protocol-SelfSystem
+%if 0%{?with_uivision}
Requires: %{name}-UI-VCAEngine
+%endif
Requires: %{name}-UI-WebCfg
Requires: %{name}-UI-WebVision
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
@@ -1276,6 +1287,9 @@ The %name-server package is virtual package for OpenSCADA-server.
%package visStation
Summary: OpenSCADA visual station
Group: Applications/Engineering
+%if 0%{?flag_el}
+BuildArch: noarch
+%endif
Requires: %name = %version-%release
Requires: %name-DB-SQLite
Requires: %name-DB-MySQL
@@ -1296,18 +1310,21 @@ Requires: %name-Transport-Sockets
Requires: %name-Transport-SSL
Requires: %name-Transport-Serial
Requires: %name-Protocol-SelfSystem
-%if 0%{!?rhel}
+%if 0%{?with_uivcaengine}
Requires: %name-UI-VCAEngine
+%endif
+%if 0%{?with_uivision}
Requires: %name-UI-Vision
+%endif
+%if 0%{?with_qtstarter}
Requires: %name-UI-QTStarter
+%endif
+%if 0%{?with_qtcfg}
Requires: %name-UI-QTCfg
%endif
Requires: %name-Special-FLibComplex1
Requires: %name-Special-FLibMath
Requires: %name-Special-FLibSYS
-%if 0%{!?rhel5}
-BuildArch: noarch
-%endif
%description visStation
The %name-viStation package is virtual package for visual
station (OpenSCADA).
@@ -1324,8 +1341,13 @@ station (OpenSCADA).
%prep
%setup -q -n %{srcname}
%setup -T -D -a 1
+
+%if "%{?dist}" == ".el6"
+%patch1 -p1
+%endif
+
# Need to delete
-#%patch0 -p1 -b .fedora
+#patch0 -p1 -b .fedora
#
%build
@@ -1379,14 +1401,14 @@ make %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} install
# let's try to get rid of rpath
chrpath --delete %{buildroot}%{_bindir}/openscada
# remove static libs and libtool archives
-rm -f %{buildroot}%{_libdir}/*.*a
-rm -f %{buildroot}%{_libdir}/openscada/*.*a
+%{__rm} -f %{buildroot}%{_libdir}/*.*a
+%{__rm} -f %{buildroot}%{_libdir}/openscada/*.*a
%{__install} -m 755 -d %{buildroot}%{_includedir}/openscada/
# %{__install} -m 644 *.h %{buildroot}%{_includedir}/openscada
@@ -1395,36 +1417,44 @@ 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_RH.init %{buildroot}%{_initrddir}/openscadad
-%{__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 755 -d %{buildroot}%{_localstatedir}/spool/openscada/{DATA,icons,LibsDB,AGLKS,Boiler}
+%{__install} -m 644 data/icons/* %{buildroot}%{_localstatedir}/spool/openscada/icons
+%{__install} -m 755 -d %{buildroot}%{_localstatedir}/spool/openscada/ARCHIVES/{MESS,VAL}
%{__install} -m 644 -pD data/LibsDB/*.db %{buildroot}%{_localstatedir}/spool/openscada/LibsDB
+# Configurations file for model of AGLKS
%{__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
-
+# Configurations file for model of Boiler
%{__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
+
+%if 0%{?flag_el}
+# Desktop files for model of 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
+# Desktop files for model of 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
+%endif
-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
+echo "OpenSCADA data dir" > %{buildroot}%{_localstatedir}/spool/openscada/DATA/info
+echo "OpenSCADA messages archive dir" > %{buildroot}%{_localstatedir}/spool/openscada/ARCHIVES/MESS/info
+echo "OpenSCADA values archive dir" > %{buildroot}%{_localstatedir}/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%{?flag_el}
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
+%endif
%find_lang o.* %{name}.lang
@@ -1902,22 +1932,36 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/%_desktopdir data
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/oscada_AGLKS.xml
%{_bindir}/openscada_AGLKS
+%{_localstatedir}/spool/openscada/AGLKS/*.db
+%if 0%{?flag_el}
%{_datadir}/%_desktopdir/openscada_AGLKS.desktop
%{_datadir}/%_iconsdir/openscada_AGLKS.png
%{_localstatedir}/spool/openscada/icons/AGLKS.png
-%{_localstatedir}/spool/openscada/AGLKS/*.db
+%endif
%files Model-Boiler
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/oscada_Boiler.xml
%{_bindir}/openscada_Boiler
+%{_localstatedir}/spool/openscada/Boiler/*.db
+%if 0%{?flag_el}
%{_datadir}/%_desktopdir/openscada_Boiler.desktop
%{_datadir}/%_iconsdir/openscada_Boiler.png
%{_localstatedir}/spool/openscada/icons/Boiler.png
-%{_localstatedir}/spool/openscada/Boiler/*.db
+%endif
%changelog
-* Mon Apr 09 2012 Aleksey Popkov <aleksey at oscada.org>
+* Mon Apr 13 2012 Aleksey Popkov <aleksey at oscada.org> - 0.8.0-3
+- Adding patch for phonon.
+- Adding some of the comments.
+- Some cosmetics and fixed.
+- Some commands are renamed in the macros.
+- Building on the CentOs5.x NOT fixed.
+
+* Mon Apr 10 2012 Aleksey Popkov <aleksey at oscada.org> - 0.8.0-2
+- Some cosmetics.
+
+* Mon Apr 09 2012 Aleksey Popkov <aleksey at oscada.org> - 0.8.0-1
- Build 0.8.0 release.
* Wed Dec 8 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.2-3
diff --git a/phonon.patch b/phonon.patch
new file mode 100644
index 0000000..c9a77cd
--- /dev/null
+++ b/phonon.patch
@@ -0,0 +1,15 @@
+diff --git a/src/moduls/ui/Vision/vis_shapes.cpp b/src/moduls/ui/Vision/vis_shapes.cpp
+index 39548e4..3e0af9a 100644
+--- a/src/moduls/ui/Vision/vis_shapes.cpp
++++ b/src/moduls/ui/Vision/vis_shapes.cpp
+@@ -58,8 +58,8 @@
+ #include "vis_shapes.h"
+
+ #ifdef HAVE_PHONON
+-#include <phonon/VideoPlayer>
+-#include <phonon/VideoWidget>
++#include <Phonon/VideoPlayer>
++#include <Phonon/VideoWidget>
+ #endif
+
+
More information about the scm-commits
mailing list