[openscada/el6] ver. 0.7.1

[Popkov Aleksey]

commit 5faca2623161880b3d52729f9f29059df0346dec
Author: aleksey <aleksey200505 at mail.ru>
Date:   Wed May 18 11:57:39 2011 +0400

    ver. 0.7.1

 openscada.spec |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/openscada.spec b/openscada.spec
index 88486bd..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 =========
@@ -54,9 +56,8 @@
 %bcond_without uivision
 %bcond_without uivcaengine
 #%define _desktopdir %_datadir/applications
-%define _desktopdir applications
-%define _iconsdir icons
 %endif
+
 # ========== Transports ==========
 %bcond_without ssl
 %bcond_without sockets
@@ -80,7 +81,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.7.1
-Release: 3%{?dist}
+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
@@ -953,7 +954,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
@@ -964,7 +967,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
@@ -977,7 +982,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
@@ -1008,7 +1015,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.
@@ -1031,7 +1040,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.
@@ -1200,7 +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
@@ -1250,7 +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
@@ -1292,7 +1307,9 @@ 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-viStation package is virtual package for visual
 station (OpenSCADA).
@@ -1312,6 +1329,7 @@ station (OpenSCADA).
 %patch0 -p1 -b .fedora
 
 %build
+autoreconf -ifv
 CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
   %configure --disable-static \
 %{!?with_dcon:--disable-DCON} \
@@ -1404,8 +1422,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}/%{_datadir}/%_desktopdir data/ModelsDB/AGLKS/openscada_AGLKS.desktop
-desktop-file-install --dir=%{buildroot}/%{_datadir}/%_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
 
@@ -1897,6 +1915,9 @@ desktop-file-install --dir=%{buildroot}/%{_datadir}/%_desktopdir data/ModelsDB/B
 %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.