rpms/openscada/devel openscada.spec,1.14,1.15

Peter Lemenkov peter at fedoraproject.org
Wed Oct 21 13:54:48 UTC 2009


Author: peter

Update of /cvs/pkgs/rpms/openscada/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16529/devel

Modified Files:
	openscada.spec 
Log Message:
Fixed the rest of broken deps


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openscada.spec	19 Oct 2009 14:42:16 -0000	1.14
+++ openscada.spec	21 Oct 2009 13:54:47 -0000	1.15
@@ -58,7 +58,7 @@
 # Only for x86_32
 %ifarch x86_64
   %if 0%{?with_diamondboards}
-  %{error: DIAMONDBOARDS support available only for %{ix86} target }  
+  %{error: DIAMONDBOARDS support available only for %{ix86} target }
 %endif
   %if 0%{?with_icpdas}
   %{error: ICP_DAS support available only for %{ix86} target }
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -978,7 +978,9 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-DAQ-BlockCalc
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-DAQ-JavaLikeCalc
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-ModBus
@@ -1010,11 +1012,15 @@ Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-DB-SQLite
 Requires: %{name}-DB-MySQL
+%if 0%{?with_firebird}
 Requires: %{name}-DB-FireBird
+%endif
 Requires: %{name}-DAQ-System
 Requires: %{name}-DAQ-BlockCalc
 Requires: %{name}-DAQ-JavaLikeCalc
+%if 0%{?with_diamondboards}
 Requires: %{name}-DAQ-DiamondBoards
+%endif
 Requires: %{name}-DAQ-LogicLevel
 Requires: %{name}-DAQ-SNMP
 Requires: %{name}-DAQ-Siemens
@@ -1022,7 +1028,9 @@ Requires: %{name}-DAQ-ModBus
 Requires: %{name}-DAQ-DCON
 Requires: %{name}-DAQ-Gate
 Requires: %{name}-DAQ-Soundcard
+%if 0%{?with_icpdas}
 Requires: %{name}-DAQ-IcpDas
+%endif
 Requires: %{name}-ARH-FSArch
 Requires: %{name}-ARH-DBArch
 Requires: %{name}-Transport-Sockets
@@ -1034,8 +1042,8 @@ Requires: %{name}-UI-VCAEngine
 Requires: %{name}-UI-WebCfg
 Requires: %{name}-UI-WebVision
 Requires: %{name}-UI-WebCfgd
-Requires: %{name}-Special-FLibComplex1
-Requires: %{name} Special-FLibMath
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
 Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
@@ -1074,9 +1082,9 @@ Requires: %name-UI-Vision
 Requires: %name-UI-QTStarter
 Requires: %name-UI-QTCfg
 %endif
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %name-Special-FlibComplex1
+Requires: %name-Special-FlibMath
+Requires: %name-Special-FlibSYS
 %description visStation
 The %name-visStation package is virtual package for visual
 station (OpenSCADA).
@@ -1479,6 +1487,9 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Wed Oct 21 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-3
+- Fixed the rest of broken deps introduced with new sub-packages.
+
 * Fri Oct 16 2009 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-2
 - Added of Obsoletes directive by Peter Lemenkov <lemenkov at gmail.com>.
 




More information about the fedora-extras-commits mailing list