rpms/openscada/EL-5 openscada.spec,1.4,1.5

[Popkov Aleksey]

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15169/EL-5

Modified Files:
	openscada.spec 
Log Message:
Some fixed


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/openscada.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openscada.spec	19 Jun 2009 20:54:34 -0000	1.4
+++ openscada.spec	30 Jun 2009 11:51:26 -0000	1.5
@@ -63,7 +63,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -96,6 +96,10 @@ BuildRequires: desktop-file-utils
 BuildRequires: sed
 BuildRequires: chrpath
 
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -111,12 +115,14 @@ Kennwort "openscada" benutzen.
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add openscadad
-/sbin/chkconfig openscadad off
 
 %postun -p /sbin/ldconfig
 
 %preun
-/sbin/chkconfig --del openscadad
+if [ $1 = 0 ]; then
+ /sbin/service openscadad stop > /dev/null 2>&1
+ /sbin/chkconfig --del openscadad
+fi
 
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
@@ -746,36 +752,83 @@ Dateien.
 Summary: Open SCADA demo data bases and config
 Group: Applications/Engineering
 Requires:%{name} = %{version}-%{release}
+# ############### ARH ########################
+%if 0%{?with_dbarch}
 Requires:%{name}-ARH-DBArch = %{version}-%{release}
+%endif
+%if 0%{?with_fsarch}
 Requires:%{name}-ARH-FSArch = %{version}-%{release}
-
+%endif
+# ############### Special ########################
+%if 0%{?with_flibmath}
 Requires:%{name}-Special-FlibMath = %{version}-%{release}
+%endif
+%if 0%{?with_flibcomplex}
 Requires:%{name}-Special-FlibComplex1 = %{version}-%{release}
+%endif
+%if 0%{?with_flibsys}
 Requires:%{name}-Special-FlibSys = %{version}-%{release}
-
+%endif
+%if 0%{?with_systemtests}
+Requires:%{name}-Special-SystemTests = %{version}-%{release}
+%endif
+# ############### DAQ ########################
+%if 0%{?with_blockcalc}
 Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
+%endif
+%if 0%{?with_javalikecalc}
 Requires:%{name}-DAQ-JavaLikeCalc = %{version}-%{release}
+%endif
+%if 0%{?with_logiclevel}
 Requires:%{name}-DAQ-LogicLevel = %{version}-%{release}
+%endif
+%if 0%{?with_system}
 Requires:%{name}-DAQ-System = %{version}-%{release}
+%endif
+%if 0%{?with_blockcalc}
 Requires:%{name}-DAQ-BlockCalc = %{version}-%{release}
+%endif
+%if 0%{?with_daqgate}
 Requires:%{name}-DAQ-Gate = %{version}-%{release}
-
+%endif
+# ############### HTTP ########################
+%if 0%{?with_http}
 Requires:%{name}-Protocol-HTTP = %{version}-%{release}
+%endif
+# ############### SelfSystem ########################
+%if 0%{?with_selfsystem}
 Requires:%{name}-Protocol-SelfSystem = %{version}-%{release}
-
+%endif
+# ############### Transport ########################
+%if 0%{?with_sockets}
 Requires:%{name}-Transport-Sockets = %{version}-%{release}
+%endif
+%if 0%{?with_ssl}
 Requires:%{name}-Transport-SSL = %{version}-%{release}
+%endif
+%if 0%{?with_serial}
 Requires:%{name}-Transport-Serial = %{version}-%{release}
-
+%endif
+# ############### GUI System ########################
 %if 0%{?with_qtstarter}
 Requires:%{name}-UI-QTStarter = %{version}-%{release}
+%endif
+%if 0%{?with_qtcfg}
 Requires:%{name}-UI-QTCfg = %{version}-%{release}
+%endif
+%if 0%{?with_qtvision}
 Requires:%{name}-UI-QTVision = %{version}-%{release}
 %endif
-
+# ############### Web Interfaces ########################
+%if 0%{?with_webcfg}
 Requires:%{name}-UI-WebCfg = %{version}-%{release}
+%endif
+%if 0%{?with_webcfgd}
 Requires:%{name}-UI-WebCfgd = %{version}-%{release}
+%endif
+%if 0%{?with_webvision}
 Requires:%{name}-UI-WebVision = %{version}-%{release}
+%endif
 
 %description demo
 The %{name}-demo package includes demo data bases and configs.
@@ -1156,6 +1209,11 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* 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>
+- Somes cosmetics.
+
 * Wed Jun 19 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-7
 - Fixed bugs maked by me.