rpms/openscada/F-12 import.log,1.11,1.12 openscada.spec,1.19,1.20

[Popkov Aleksey]

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10789/F-12

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



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	27 Jan 2010 09:25:14 -0000	1.11
+++ import.log	4 Feb 2010 12:32:54 -0000	1.12
@@ -9,3 +9,4 @@ openscada-0_6_4-1_fc11:F-12:openscada-0.
 openscada-0_6_4-2_fc11:F-12:openscada-0.6.4-2.fc11.src.rpm:1255937062
 openscada-0_6_4_1-4_fc11:F-12:openscada-0.6.4.1-4.fc11.src.rpm:1264506574
 openscada-0_6_4_1-5_fc11:F-12:openscada-0.6.4.1-5.fc11.src.rpm:1264584261
+openscada-0_6_4_1-8_fc11:F-12:openscada-0.6.4.1-8.fc11.src.rpm:1265286718


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-12/openscada.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- openscada.spec	27 Jan 2010 09:25:14 -0000	1.19
+++ openscada.spec	4 Feb 2010 12:32:54 -0000	1.20
@@ -68,7 +68,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.4.1
-Release: 5%{?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
@@ -795,21 +799,21 @@ der mathematischen Funktionen.
 %endif
 
 %if 0%{?with_flibsys}
-%package Special-FLibSys
+%package Special-FLibSYS
 Summary: Open SCADA special
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
-%description Special-FLibSys
-The %name-Special-FLibSys allows system API functions library
+%description Special-FLibSYS
+The %name-Special-FLibSYS allows system API functions library
 of the user programming area.
-%description Special-FLibSys -l ru_RU.UTF8
-Пакет %name-Special-FLibSys предоставляет в систему библиотеку
+%description Special-FLibSYS -l ru_RU.UTF8
+Пакет %name-Special-FLibSYS предоставляет в систему библиотеку
 системного API среды пользовательского программирования.
-%description Special-FLibSys -l uk_UA.UTF8
-Пакет %name-Special-FLibSys надає в систему бібліотеку
+%description Special-FLibSYS -l uk_UA.UTF8
+Пакет %name-Special-FLibSYS надає в систему бібліотеку
 системного API середовища програмування користувача.
-%description Special-FLibSys -l de_DE.UTF8
-Das Paket %name-Special-FLibSys gewährt in das System die
+%description Special-FLibSYS -l de_DE.UTF8
+Das Paket %name-Special-FLibSYS gewährt in das System die
 Bibliothek der API-Systemprogrammierung des Nutzersbereiches.
 %endif
 
@@ -883,7 +887,7 @@ Requires:%{name}-Special-FLibMath = %{ve
 Requires:%{name}-Special-FLibComplex1 = %{version}-%{release}
 %endif
 %if 0%{?with_flibsys}
-Requires:%{name}-Special-FLibSys = %{version}-%{release}
+Requires:%{name}-Special-FLibSYS = %{version}-%{release}
 %endif
 %if 0%{?with_systemtests}
 Requires:%{name}-Special-SystemTests = %{version}-%{release}
@@ -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
@@ -988,7 +994,7 @@ Requires: %{name}-Protocol-HTTP
 Requires: %{name}-Protocol-SelfSystem
 Requires: %{name}-Special-FLibComplex1
 Requires: %{name}-Special-FLibMath
-Requires: %{name}-Special-FLibSys
+Requires: %{name}-Special-FLibSYS
 Requires: %{name}-Transport-SSL
 Requires: %{name}-Transport-Serial
 Requires: %{name}-Transport-Sockets
@@ -1042,7 +1048,7 @@ Requires: %{name}-UI-WebVision
 Requires: %{name}-UI-WebCfgd
 Requires: %{name}-Special-FLibComplex1
 Requires: %{name}-Special-FLibMath
-Requires: %{name}-Special-FLibSys
+Requires: %{name}-Special-FLibSYS
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
 %description server -l ru_RU.UTF8
@@ -1456,7 +1462,7 @@ desktop-file-install --dir=%{buildroot}%
 %endif
 
 %if 0%{?with_flibsys}
-%files Special-FLibSys
+%files Special-FLibSYS
 %defattr(-,root,root)
 %{_libdir}/openscada/spec_FLibSYS.so
 %endif
@@ -1485,8 +1491,17 @@ 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.
+
 * Tue Jan 26 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-5
-- Fixed of dependences.
+- Fixed of dependencies.
 
 * Tue Jan 26 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-4
 - The macros doc is edited.