[openscada] ver. 0.7.0
Popkov Aleksey
aleksey2005 at fedoraproject.org
Wed Sep 14 11:09:03 UTC 2011
commit 642f5225ea3cc0451487703fb4fdad4f1ba53f55
Author: aleksey <aleksey200505 at mail.ru>
Date: Wed Sep 14 15:07:33 2011 +0400
ver. 0.7.0
openscada.spec | 159 ++++++++++++++++++++++++++++++++++-------------------
oscada.init.patch | 2 +-
sources | 4 +-
3 files changed, 105 insertions(+), 60 deletions(-)
---
diff --git a/openscada.spec b/openscada.spec
index 7bcf1fc..8b48b99 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -1,6 +1,7 @@
-#===== 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 =========
@@ -53,9 +54,9 @@
%bcond_without qtcfg
%bcond_without uivision
%bcond_without uivcaengine
-%define _desktopdir %_datadir/applications
-%define _iconsdir /usr/share/icons
+#%define _desktopdir %_datadir/applications
%endif
+
# ========== Transports ==========
%bcond_without ssl
%bcond_without sockets
@@ -79,11 +80,13 @@
Summary: Open SCADA system project
Name: openscada
Version: 0.7.1
-Release: 2%{?dist}
+Release: 5%{?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
+# Need to delete
# Init scripts for fedora
Patch0: oscada.init.patch
+#
License: GPLv2
Group: Applications/Engineering
URL: http://oscada.org.ua
@@ -93,7 +96,7 @@ ExclusiveArch: %{ix86} x86_64
BuildRequires: gettext
BuildRequires: gd-devel
-BuildRequires: expat-devel
+#BuildRequires: expat-devel
BuildRequires: byacc
BuildRequires: bison
%if 0%{?rhel}
@@ -123,6 +126,8 @@ Obsoletes: %{name}-Special-FlibComplex1
Obsoletes: %{name}-Special-FlibMath
Obsoletes: %{name}-Special-FlibSys
+Obsoletes: %{name}-demo
+
%description
Open SCADA system. For access use account "root" and password "openscada".
%description -l ru_RU.UTF8
@@ -952,6 +957,9 @@ OpenSCADA-System
%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
@@ -962,6 +970,9 @@ 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
%description docRU
@@ -974,6 +985,9 @@ 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
%description docUK
@@ -1004,6 +1018,9 @@ Dateien.
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-Main
The %{name}-LibDB-Main package includes main OpenSCADA libraries
into SQLite DB.
@@ -1026,6 +1043,9 @@ LibsDB/OscadaLibs.db.
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.
@@ -1194,6 +1214,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
@@ -1243,6 +1266,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
@@ -1284,8 +1310,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 это виртуальный пакет для визуальной
@@ -1300,9 +1329,12 @@ station (OpenSCADA).
%prep
%setup -q -n %{srcname}
%setup -T -D -a 1
+# Need to delete
%patch0 -p1 -b .fedora
+#
%build
+autoreconf -ifv
CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
%configure --disable-static \
%{!?with_dcon:--disable-DCON} \
@@ -1367,6 +1399,9 @@ 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
+# Need to delete
+#%{__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}
@@ -1375,16 +1410,16 @@ rm -f %{buildroot}%{_libdir}/openscada/*.*a
%{__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}/%_iconsdir/openscada_AGLKS.png
+%{__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}/%_desktopdir/openscada_AGLKS.desktop
+%{__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}/%_iconsdir/openscada_Boiler.png
+%{__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}/%_desktopdir/openscada_Boiler.desktop
+%{__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
@@ -1395,8 +1430,8 @@ echo "OpenSCADA values archive dir" > %{buildroot}/var/spool/openscada/ARCHIVES/
%{__sed} -i 's|OPENSCADA_BIN=|OPENSCADA_BIN=%{_bindir}/openscada|' %{buildroot}%{_initrddir}/openscadad
# installation of *.desktop files
-desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/AGLKS/openscada_AGLKS.desktop
-desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/openscada_Boiler.desktop
+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
@@ -1863,31 +1898,41 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
%files LibDB-Main
%defattr(-,root,root)
-%dir %{_localstatedir}/spool/openscada/LibsDB/OscadaLibs.db
+%{_localstatedir}/spool/openscada/LibsDB/OscadaLibs.db
%files LibDB-VCA
%defattr(-,root,root)
-%dir %{_localstatedir}/spool/openscada/LibsDB/vca*.db
+%{_localstatedir}/spool/openscada/LibsDB/vca*.db
%files Model-AGLKS
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/oscada_AGLKS.xml
%{_bindir}/openscada_AGLKS
-%_desktopdir/openscada_AGLKS.desktop
-%_iconsdir/openscada_AGLKS.png
-%dir %{_localstatedir}/spool/openscada/icons/AGLKS.png
-%dir %{_localstatedir}/spool/openscada/AGLKS/*.db
+%{_datadir}/%_desktopdir/openscada_AGLKS.desktop
+%{_datadir}/%_iconsdir/openscada_AGLKS.png
+%{_localstatedir}/spool/openscada/icons/AGLKS.png
+%{_localstatedir}/spool/openscada/AGLKS/*.db
%files Model-Boiler
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/oscada_Boiler.xml
%{_bindir}/openscada_Boiler
-%_desktopdir/openscada_Boiler.desktop
-%_iconsdir/openscada_Boiler.png
-%dir %{_localstatedir}/spool/openscada/icons/Boiler.png
-%dir %{_localstatedir}/spool/openscada/Boiler/*.db
+%{_datadir}/%_desktopdir/openscada_Boiler.desktop
+%{_datadir}/%_iconsdir/openscada_Boiler.png
+%{_localstatedir}/spool/openscada/icons/Boiler.png
+%{_localstatedir}/spool/openscada/Boiler/*.db
%changelog
+* Wed Sep 14 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.1-5
+- Adding of directive Obsoletes for demo package.
+- Removed to some directives dir by Roman Savochenko (rom_as at oscada.org).
+
+* 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.
@@ -1899,16 +1944,16 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
- 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
+- Rebuild of 0.7.0.2 version.
- Fixed UI.WebVision: Function VCAElFigure::dashDotFigureBorders() realisation wrong comment is fixed.
* Wed Mar 2 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.0.2-1
- Build of 0.7.0.2 version.
* Tue Jan 11 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.0.1-5
-- Moved files of messages from main package to the self package
-- Fixed macros errors
-- Fixed of error in oscada.init.patch file
+- Moved files of messages from main package to the self package.
+- Fixed macros errors.
+- Fixed of error in oscada.init.patch file.
- Fixed somes of spelling-error.
* Tue Jan 4 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.0.1-4
@@ -1921,7 +1966,7 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
- Fixed BuildRequires.
* Mon Dec 20 2010 Aleksey Popkov <aleksey at oscada.org> - 0.7.0.1-1
-- Fixed Source0 patch
+- Fixed Source0 patch.
- Build 0.7.0.1 update to production release.
* Tue Nov 26 2010 Aleksey Popkov <aleksey at oscada.org> - 0.7.0-3
@@ -1935,14 +1980,14 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
- 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
+- 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
+- Fixed of dependencies in Obsoletes directives.
- Change of Source0 url path.
* Tue Jan 30 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-8
@@ -1967,25 +2012,25 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
- Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
* Sun Oct 11 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-1
-- The change version for release 0.6.4
-- Moved Ui-VCAEngine module to the self package
-- Removed QTStarter module from the main package
-- Added the virtual plc, server, visStation packages
-- Some cosmetics
+- The change version for release 0.6.4.
+- Moved Ui-VCAEngine module to the self package.
+- Removed QTStarter module from the main package.
+- Added the virtual plc, server, visStation packages.
+- Some cosmetics.
- Fixed somes bugs Peter Lemenkov <lemenkov at gmail.com>.
* Sun Oct 4 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.4-1
-- Adding self module ICP_DAS
-- Fixed Germany Language translations by Popkova Irina
-- Delete openscada-0.6.3.3-openssl.patch from previouns version
+- Adding self module ICP_DAS.
+- Fixed Germany Language translations by Popkova Irina.
+- Delete openscada-0.6.3.3-openssl.patch from previouns version.
- Adding the next version of the package.
* Tue Sep 1 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.3.3-13
-- Adding Requires for webcfg, webcfgd, webvision, http and snmp
+- Adding Requires for webcfg, webcfgd, webvision, http and snmp.
- Some cosmetics.
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.3.3-12
-- rebuilt with new openssl
+- rebuilt with new openssl.
* Mon Jul 27 2009 Popkov Aleksey <aleksey at oscada.org.ua> - 0.6.3.3-11
- Fixed of macros find_lang for epel-5 by Peter Lemenkov <lemenkov at gmail.com>.
@@ -1994,12 +2039,12 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild.
* Tue Jul 14 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-9
-- Adding find_lang macros by Peter Lemenkov <lemenkov at gmail.com>
+- Adding find_lang macros by Peter Lemenkov <lemenkov at gmail.com>.
- Somes cosmetics.
* Tue Jun 30 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-8
-- Added of dependences in to self package demo
-- Fixed preun section by Peter Lemenkov <lemenkov at gmail.com>
+- Added of dependences in to self package demo.
+- Fixed preun section by Peter Lemenkov <lemenkov at gmail.com>.
- Somes cosmetics.
* Wed Jun 19 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-7
@@ -2015,12 +2060,12 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
- Enabled Portaudio-devel library by Popkov Aleksey.
* Tue Jun 16 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-3
-- Adapted spec file for dist 5E-epel by Popkov Aleksey
-- Adapted spec file for dist 4E-epel by Popkov Aleksey (Not tested)
+- Adapted spec file for dist 5E-epel by Popkov Aleksey.
+- Adapted spec file for dist 4E-epel by Popkov Aleksey (Not tested).
- Fixed oscada.init.patch for cases messages.
* Thu Jun 11 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-2
-- Fixed incoherent-init-script-name warning of rename init scripts from oscadad to openscadad by Popkov Aleksey
+- Fixed incoherent-init-script-name warning of rename init scripts from oscadad to openscadad by Popkov Aleksey.
- Fixed incoherent-subsys error of rename into init scripts from lockfile=/var/lock/subsys/oscadad to lockfile=/var/lock/subsys/openscadad by Popkov Aleksey.
* Wed Jun 10 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-1
@@ -2066,23 +2111,23 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
- Rebuilded for support x86_64 several distributives and some build system bugs is fixed.
* Sat Mar 23 2008 Roman Savochenko <rom_as at diyaorg.dp.ua>
-- menu files included
+- menu files included.
* Fri Sep 02 2005 Roman Savochenko <rom_as at fromru.com>
-- replace testdate whith demo package
-- rename xinetd script from openscada to oscadad
-- add xinetd script to generic package
+- replace testdate whith demo package.
+- rename xinetd script from openscada to oscadad.
+- add xinetd script to generic package.
* Wed Mar 16 2005 Roman Savochenko <rom_as at fromru.com>
-- add Athena board specific build
+- add Athena board specific build.
* Wed Nov 03 2004 Roman Savochenko <rom_as at fromru.com>
-- move the message arhives data to /var/spool/{name}/ARHIVE/MESS
+- move the message arhives data to /var/spool/{name}/ARHIVE/MESS.
* Tue Apr 06 2004 Roman Savochenko <rom_as at fromru.com>
-- make 3 packages: OpenScada, OpenScada-devel, OpenScada-testdata
-- add languages: ru, uk
+- make 3 packages: OpenScada, OpenScada-devel, OpenScada-testdata.
+- add languages: ru, uk.
- make packages from 'make -dist' package;
* Thu Oct 15 2003 Roman Savochenko <rom_as at fromru.com>
-- Starting
+- Starting.
diff --git a/oscada.init.patch b/oscada.init.patch
index f3e59d5..d7e3ad9 100644
--- a/oscada.init.patch
+++ b/oscada.init.patch
@@ -10,7 +10,7 @@ index 21744dd..cdecaf8 100644
-OPENSCADA=/usr/bin/openscada
+bindir=/usr/bin
+lockfile=/var/lock/subsys/openscadad
-+OPENSCADA_BIN=
++OPENSCADA_BIN=${bindir}/openscada
ARGS="--demon &> /dev/null"
RETVAL=0
diff --git a/sources b/sources
index 5e97608..fc95d45 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-170ab815636238b3158ab450e683496d openscada-0.7.1.tar.lzma
-a09fd1706d34b8305bc19d7118f5fb22 openscada-res-0.7.1.tar.lzma
+bd14e826a6d915356d9942502b70b765 openscada-0.7.1.tar.lzma
+c59564dec6d325ed7631dee684089b0e openscada-res-0.7.1.tar.lzma
More information about the scm-commits
mailing list