rpms/openscada/devel import.log,1.12,1.13 openscada.spec,1.20,1.21

[Popkov Aleksey]

Author: aleksey2005

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

Modified Files:
	import.log openscada.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- import.log	29 Jan 2010 08:43:49 -0000	1.12
+++ import.log	1 Feb 2010 06:58:57 -0000	1.13
@@ -10,3 +10,4 @@ openscada-0_6_4-2_fc11:HEAD:openscada-0.
 openscada-0_6_4_1-4_fc11:HEAD:openscada-0.6.4.1-4.fc11.src.rpm:1264508836
 openscada-0_6_4_1-5_fc11:HEAD:openscada-0.6.4.1-5.fc11.src.rpm:1264584606
 openscada-0_6_4_1-6_fc11:HEAD:openscada-0.6.4.1-6.fc11.src.rpm:1264754591
+openscada-0_6_4_1-8_fc11:HEAD:openscada-0.6.4.1-8.fc11.src.rpm:1265007157


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- openscada.spec	29 Jan 2010 08:43:49 -0000	1.20
+++ openscada.spec	1 Feb 2010 06:58:57 -0000	1.21
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4.1
-Release: 6%{?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
@@ -108,6 +108,10 @@ Requires(preun): initscripts
 
 Obsoletes: %{name}-UI-QTVision
 
+Obsoletes: %{name}-Special-FLibComplex1
+Obsoletes: %{name}-Special-FLibMath
+Obsoletes: %{name}-Special-FLibSYS
+
 %description
 Open SCADA system. For access use account "root" and password "openscada".
 %description -l ru_RU.UTF8
@@ -978,7 +982,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
@@ -1485,6 +1491,12 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %changelog
+* Tue Jan 30 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-8
+- Fixed of dependencies.
+
+* Tue Jan 29 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-7
+- Added of obsoletes and provides directives.
+
 * Tue Jan 29 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-6
 - Fixed of dependencies.