[openscada/f13/master] Release 0.7.1

Tue Apr 19 06:31:13 UTC 2011

commit 84940dae23a152b71778821464c9f61d3b8a34f7
Author: aleksey <aleksey200505 at mail.ru>
Date:   Tue Apr 19 10:31:49 2011 +0400

    Release 0.7.1

 openscada.spec |   32 ++++++++++++++++++++++----------
 sources        |    4 ++--
 2 files changed, 24 insertions(+), 12 deletions(-)
---

diff --git a/openscada.spec b/openscada.spec
index 7bcf1fc..e071a5d 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -53,7 +53,8 @@
 %bcond_without qtcfg
 %bcond_without uivision
 %bcond_without uivcaengine
-%define _desktopdir %_datadir/applications
+#%define _desktopdir %_datadir/applications
+%define _desktopdir applications
 %define _iconsdir /usr/share/icons
 %endif
 # ========== Transports ==========
@@ -79,7 +80,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -93,7 +94,7 @@ ExclusiveArch:  %{ix86} x86_64
 
 BuildRequires: gettext
 BuildRequires: gd-devel
-BuildRequires: expat-devel
+#BuildRequires: expat-devel
 BuildRequires: byacc
 BuildRequires: bison
 %if 0%{?rhel}
@@ -952,6 +953,7 @@ OpenSCADA-System
 %package docEN
 Summary: Open SCADA documents
 Group: Documentation
+BuildArch: noarch
 %description docEN
 The %name-docEN package include documents files (English).
 %description docEN -l ru_RU.UTF8
@@ -962,6 +964,7 @@ The %name-docEN package include documents files (English).
 Das Paket %name-docEN enthält die Dokumentationsdateien (Englisch).
 
 %package docRU
+BuildArch: noarch
 Summary: Open SCADA documents
 Group: Documentation
 %description docRU
@@ -974,6 +977,7 @@ The %name-docRU package include documents files (Russian).
 Das Paket %name-docRU enthält die Dokumentationsdateien (Russisch).
 
 %package docUK
+BuildArch: noarch
 Summary: Open SCADA documents
 Group: Documentation
 %description docUK
@@ -1004,6 +1008,7 @@ Dateien.
 Summary: Main OpenSCADA libraries for DAQ and other into SQLite DB.
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+BuildArch: noarch
 %description LibDB-Main
 The %{name}-LibDB-Main package includes main OpenSCADA libraries
 into SQLite DB.
@@ -1026,6 +1031,7 @@ LibsDB/OscadaLibs.db.
 Summary: Main OpenSCADA libraries for DAQ and other into SQLite DB.
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+BuildArch: noarch
 %description LibDB-VCA
 The %{name}-LibDB-VCA package includes visual components libraries
 into SQLite DB.
@@ -1194,6 +1200,7 @@ Requires: %{name}-Transport-Sockets
 Requires: %{name}-UI-VCAEngine
 Requires: %{name}-UI-WebCfgd
 Requires: %{name}-UI-WebVision
+BuildArch: noarch
 %description plc
 The %{name}-plc package is virtual package for PLC.
 %description plc -l ru_RU.UTF8
@@ -1243,6 +1250,7 @@ Requires: %{name}-UI-WebCfgd
 Requires: %{name}-Special-FLibComplex1
 Requires: %{name}-Special-FLibMath
 Requires: %{name}-Special-FLibSYS
+BuildArch: noarch
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1284,8 +1292,9 @@ Requires: %name-UI-QTCfg
 Requires: %name-Special-FLibComplex1
 Requires: %name-Special-FLibMath
 Requires: %name-Special-FLibSYS
+BuildArch: noarch
 %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 это виртуальный пакет для визуальной
@@ -1377,14 +1386,14 @@ rm -f %{buildroot}%{_libdir}/openscada/*.*a
 %{__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}%{_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}%{_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 +1404,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 --dir=%{buildroot}/%{_datadir}/%_desktopdir data/ModelsDB/AGLKS/openscada_AGLKS.desktop
+desktop-file-install --dir=%{buildroot}/%{_datadir}/%_desktopdir data/ModelsDB/Boiler/openscada_Boiler.desktop
 
 %find_lang o.* %{name}.lang
 
@@ -1873,7 +1882,7 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/oscada_AGLKS.xml
 %{_bindir}/openscada_AGLKS
-%_desktopdir/openscada_AGLKS.desktop
+%{_datadir}/%_desktopdir/openscada_AGLKS.desktop
 %_iconsdir/openscada_AGLKS.png
 %dir %{_localstatedir}/spool/openscada/icons/AGLKS.png
 %dir %{_localstatedir}/spool/openscada/AGLKS/*.db
@@ -1882,12 +1891,15 @@ desktop-file-install --dir=%{buildroot}/%_desktopdir data/ModelsDB/Boiler/opensc
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/oscada_Boiler.xml
 %{_bindir}/openscada_Boiler
-%_desktopdir/openscada_Boiler.desktop
+%{_datadir}/%_desktopdir/openscada_Boiler.desktop
 %_iconsdir/openscada_Boiler.png
 %dir %{_localstatedir}/spool/openscada/icons/Boiler.png
 %dir %{_localstatedir}/spool/openscada/Boiler/*.db 
 
 %changelog
+* 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.
 
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
