rpms/openscada/EL-5 import.log,1.7,1.8 openscada.spec,1.13,1.14
Popkov Aleksey
aleksey2005 at fedoraproject.org
Mon Feb 8 06:30:24 UTC 2010
Author: aleksey2005
Update of /cvs/pkgs/rpms/openscada/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3176/EL-5
Modified Files:
import.log openscada.spec
Log Message:
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log 26 Jan 2010 11:57:07 -0000 1.7
+++ import.log 8 Feb 2010 06:30:23 -0000 1.8
@@ -5,3 +5,4 @@ openscada-0_6_3_3-7_fc10:EL-5:openscada-
openscada-0_6_4-1_fc11:EL-5:openscada-0.6.4-1.fc11.src.rpm:1255427219
openscada-0_6_4-2_fc11:EL-5:openscada-0.6.4-2.fc11.src.rpm:1255938476
openscada-0_6_4_1-4_fc11:EL-5:openscada-0.6.4.1-4.fc11.src.rpm:1264506922
+openscada-0_6_4_1-8_fc11:EL-5:openscada-0.6.4.1-8.fc11.src.rpm:1265610520
Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-5/openscada.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- openscada.spec 26 Jan 2010 11:57:07 -0000 1.13
+++ openscada.spec 8 Feb 2010 06:30:24 -0000 1.14
@@ -68,7 +68,7 @@
Summary: Open SCADA system project
Name: openscada
Version: 0.6.4.1
-Release: 4%{?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
@@ -757,59 +761,59 @@ Interfaces wie RS232, RS485, GSM und and
############################# Functions-System #########################
%if 0%{?with_flibcomplex}
-%package Special-FlibComplex1
+%package Special-FLibComplex1
Summary: Open SCADA special
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
-%description Special-FlibComplex1
-The %name-Special-FlibComplex1 allows static function library
+%description Special-FLibComplex1
+The %name-Special-FLibComplex1 allows static function library
Complex1 (SCADA Complex1 functions).
-%description Special-FlibComplex1 -l ru_RU.UTF8
-Пакет %name-Special-FlibComplex1-Sockets предоставляет статическую
+%description Special-FLibComplex1 -l ru_RU.UTF8
+Пакет %name-Special-FLibComplex1-Sockets предоставляет статическую
библиотеку функций Complex1 (функции SCADA Complex1).
-%description Special-FlibComplex1 -l uk_UA.UTF8
-Пакет %name-Special-FlibComplex1 надає статичну бібліотеку функцій
+%description Special-FLibComplex1 -l uk_UA.UTF8
+Пакет %name-Special-FLibComplex1 надає статичну бібліотеку функцій
Complex1 (функції SCADA Complex1).
-%description Special-FlibComplex1 -l de_DE.UTF8
-Das Paket %name-Special-FlibComplex1s enthält statische
+%description Special-FLibComplex1 -l de_DE.UTF8
+Das Paket %name-Special-FLibComplex1s enthält statische
Bibliothek der Complex1-Funktionen (Funktionen SCADA Complex1).
%endif
%if 0%{?with_flibmath}
-%package Special-FlibMath
+%package Special-FLibMath
Summary: Open SCADA special
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
-%description Special-FlibMath
-The %name-Special-FlibMath allows mathematic static function
+%description Special-FLibMath
+The %name-Special-FLibMath allows mathematic static function
library.
-%description Special-FlibMath -l ru_RU.UTF8
-Пакет %name-Special-FlibMath предоставляет библиотеку стандартных
+%description Special-FLibMath -l ru_RU.UTF8
+Пакет %name-Special-FLibMath предоставляет библиотеку стандартных
математических функций.
-%description Special-FlibMath -l uk_UA.UTF8
-Пакет %name-Special-FlibMath надає статичну бібліотеку
+%description Special-FLibMath -l uk_UA.UTF8
+Пакет %name-Special-FLibMath надає статичну бібліотеку
математичних функцій.
-%description Special-FlibMath -l de_DE.UTF8
-Das Paket %name-Special-FlibMath enthält die Standardbibliothek
+%description Special-FLibMath -l de_DE.UTF8
+Das Paket %name-Special-FLibMath enthält die Standardbibliothek
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
@@ -877,13 +881,13 @@ Requires:%{name}-ARH-FSArch = %{version}
%endif
# ############### Special ########################
%if 0%{?with_flibmath}
-Requires:%{name}-Special-FlibMath = %{version}-%{release}
+Requires:%{name}-Special-FLibMath = %{version}-%{release}
%endif
%if 0%{?with_flibcomplex}
-Requires:%{name}-Special-FlibComplex1 = %{version}-%{release}
+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
@@ -986,9 +992,9 @@ 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}-Special-FLibComplex1
+Requires: %{name}-Special-FLibMath
+Requires: %{name}-Special-FLibSYS
Requires: %{name}-Transport-SSL
Requires: %{name}-Transport-Serial
Requires: %{name}-Transport-Sockets
@@ -1010,11 +1016,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 +1032,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
@@ -1035,8 +1047,8 @@ Requires: %{name}-UI-WebCfg
Requires: %{name}-UI-WebVision
Requires: %{name}-UI-WebCfgd
Requires: %{name}-Special-FLibComplex1
-Requires: %{name} Special-FLibMath
-Requires: %{name}-Special-FlibSys
+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
@@ -1127,8 +1139,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
%{!?with_daqgate:--disable-DAQGate} \
%{!?with_icpdas:--disable-ICP_DAS} \
%{!?with_selfsystem:--disable-SelfSystem} \
-%{!?with_flibcomplex:--disable-FlibComplex1} \
-%{!?with_flibmath:--disable-FlibMath} \
+%{!?with_flibcomplex:--disable-FLibComplex1} \
+%{!?with_flibmath:--disable-FLibMath} \
%{!?with_flibsys:-disable-FlibSYS} \
%{!?with_systemtests:--disable-SelfSystem} \
%{!?with_qtstarter:--disable-QTStarter}
@@ -1438,19 +1450,19 @@ desktop-file-install --dir=%{buildroot}%
%endif
%if 0%{?with_flibcomplex}
-%files Special-FlibComplex1
+%files Special-FLibComplex1
%defattr(-,root,root)
%{_libdir}/openscada/spec_FLibComplex1.so
%endif
%if 0%{?with_flibmath}
-%files Special-FlibMath
+%files Special-FLibMath
%defattr(-,root,root)
%{_libdir}/openscada/spec_FLibMath.so
%endif
%if 0%{?with_flibsys}
-%files Special-FlibSys
+%files Special-FLibSYS
%defattr(-,root,root)
%{_libdir}/openscada/spec_FLibSYS.so
%endif
@@ -1479,6 +1491,18 @@ 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 dependencies.
+
* Tue Jan 26 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-4
- The macros doc is edited.
More information about the scm-commits
mailing list