rpms/openscada/devel import.log,1.8,1.9 openscada.spec,1.13,1.14

Popkov Aleksey aleksey2005 at fedoraproject.org
Mon Oct 19 14:42:17 UTC 2009 

Author: aleksey2005

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

Modified Files:
	import.log openscada.spec 
Log Message:
Release OpenSCADA 0.6.4


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	13 Oct 2009 09:50:17 -0000	1.8
+++ import.log	19 Oct 2009 14:42:15 -0000	1.9
@@ -6,3 +6,4 @@ openscada-0_6_3_3-6_fc10:HEAD:openscada-
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245444161
 openscada-0_6_3_3-7_fc10:HEAD:openscada-0.6.3.3-7.fc10.src.rpm:1245447259
 openscada-0_6_4-1_fc11:HEAD:openscada-0.6.4-1.fc11.src.rpm:1255427409
+openscada-0_6_4-2_fc11:HEAD:openscada-0.6.4-2.fc11.src.rpm:1255963224


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openscada.spec	13 Oct 2009 09:50:17 -0000	1.13
+++ openscada.spec	19 Oct 2009 14:42:16 -0000	1.14
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -106,6 +106,8 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 
+Obsoletes: %{name}-UI-QTVision
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -937,7 +939,7 @@ Requires:%{name}-UI-QTCfg = %{version}-%
 Requires:%{name}-UI-Vision = %{version}-%{release}
 %endif
 %if 0%{?with_uivcaengine}
-Requires:%{name}-UI-VCAEngane = %{version}-%{release}
+Requires:%{name}-UI-VCAEngine = %{version}-%{release}
 %endif
 # ############### Web Interfaces ########################
 %if 0%{?with_webcfg}
@@ -971,70 +973,70 @@ und das Kennwort "openscada" oder die An
 
 # ############################### Virtual Packages ###################################
 %package plc
-Summary: OpenSCADA PLC.
+Summary: OpenSCADA PLC
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-Archive-FSArch
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-System
-Requires: %name-DB-SQLite
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-Special-FLibComplex1
-Requires: %name-Special-FLibMath
-Requires: %name-Special-FLibSYS
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Transport-Sockets
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfgD
-Requires: %name-UI-WebVision
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-System
+Requires: %{name}-DB-SQLite
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+Requires: %{name}-Special-FlibComplex1
+Requires: %{name}-Special-FlibMath
+Requires: %{name}-Special-FlibSys
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-UI-VCAEngine
+Requires: %{name}-UI-WebCfgd
+Requires: %{name}-UI-WebVision
 %description plc
-The %name-plc package is virtual package for PLC.
+The %{name}-plc package is virtual package for PLC.
 %description plc -l ru_RU.UTF8
-Пакет %name-plc это виртуальный пакет для ПЛК.
+Пакет %{name}-plc это виртуальный пакет для ПЛК.
 %description plc -l uk_UA.UTF8
-Пакет %name-plc це віртуальний пакет для ПЛК.
+Пакет %{name}-plc це віртуальний пакет для ПЛК.
 %description plc -l de_RU.UTF8
-Пакет %name-plc ist das Virtualpaket für PLC.
+Пакет %{name}-plc ist das Virtualpaket für PLC.
 
 %package server
-Summary: OpenSCADA server.
+Summary: OpenSCADA server
 Group: Applications/Engineering
-Requires: %name = %version-%release
-Requires: %name-DB-SQLite
-Requires: %name-DB-MySQL
-Requires: %name-DB-FireBird
-Requires: %name-DAQ-System
-Requires: %name-DAQ-BlockCalc
-Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-DiamondBoards
-Requires: %name-DAQ-LogicLev
-Requires: %name-DAQ-SNMP
-Requires: %name-DAQ-Siemens
-Requires: %name-DAQ-ModBus
-Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-DAQ-ICP_DAS
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
-Requires: %name-Transport-Sockets
-Requires: %name-Transport-SSL
-Requires: %name-Transport-Serial
-Requires: %name-Protocol-HTTP
-Requires: %name-Protocol-SelfSystem
-Requires: %name-UI-VCAEngine
-Requires: %name-UI-WebCfg
-Requires: %name-UI-WebVision
-Requires: %name-WebCfgD
-Requires: %name-Special-FLibComplex1
-Requires: %name Special-FLibMath
-Requires: %name-Special-FLibSYS
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-DB-SQLite
+Requires: %{name}-DB-MySQL
+Requires: %{name}-DB-FireBird
+Requires: %{name}-DAQ-System
+Requires: %{name}-DAQ-BlockCalc
+Requires: %{name}-DAQ-JavaLikeCalc
+Requires: %{name}-DAQ-DiamondBoards
+Requires: %{name}-DAQ-LogicLevel
+Requires: %{name}-DAQ-SNMP
+Requires: %{name}-DAQ-Siemens
+Requires: %{name}-DAQ-ModBus
+Requires: %{name}-DAQ-DCON
+Requires: %{name}-DAQ-Gate
+Requires: %{name}-DAQ-Soundcard
+Requires: %{name}-DAQ-IcpDas
+Requires: %{name}-ARH-FSArch
+Requires: %{name}-ARH-DBArch
+Requires: %{name}-Transport-Sockets
+Requires: %{name}-Transport-SSL
+Requires: %{name}-Transport-Serial
+Requires: %{name}-Protocol-HTTP
+Requires: %{name}-Protocol-SelfSystem
+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-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1045,7 +1047,7 @@ The %name-server package is virtual pack
 Пакет %name-server это виртуальный пакет для сервера OpenSCADA.
 
 %package visStation
-Summary: OpenSCADA visual station.
+Summary: OpenSCADA visual station
 Group: Applications/Engineering
 Requires: %name = %version-%release
 Requires: %name-DB-SQLite
@@ -1053,15 +1055,15 @@ Requires: %name-DB-MySQL
 Requires: %name-DAQ-System
 Requires: %name-DAQ-BlockCalc
 Requires: %name-DAQ-JavaLikeCalc
-Requires: %name-DAQ-LogicLev
+Requires: %name-DAQ-LogicLevel
 Requires: %name-DAQ-SNMP
 Requires: %name-DAQ-Siemens
 Requires: %name-DAQ-ModBus
 Requires: %name-DAQ-DCON
-Requires: %name-DAQ-DAQGate
-Requires: %name-DAQ-SoundCard
-Requires: %name-Archive-FSArch
-Requires: %name-Archive-DBArch
+Requires: %name-DAQ-Gate
+Requires: %name-DAQ-Soundcard
+Requires: %name-ARH-FSArch
+Requires: %name-ARH-DBArch
 Requires: %name-Transport-Sockets
 Requires: %name-Transport-SSL
 Requires: %name-Transport-Serial
@@ -1477,12 +1479,16 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* 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>.
+
 * 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-VCAEngane module to the self package
+- Moved Ui-VCAEngine module to the self package
 - Removed QTStarter module from the main package
 - Added the virtual plc, server, visStation packages
-- Some cosmetics.
+- 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

More information about the fedora-extras-commits mailing list