rpms/openscada/F-10 .cvsignore, 1.3, 1.4 import.log, 1.8, 1.9 openscada.spec, 1.14, 1.15 sources, 1.4, 1.5
Popkov Aleksey
aleksey2005 at fedoraproject.org
Wed Feb 17 13:11:09 UTC 2010
Author: aleksey2005
Update of /cvs/pkgs/rpms/openscada/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18018/F-10
Modified Files:
.cvsignore import.log openscada.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 13 Oct 2009 09:48:24 -0000 1.3
+++ .cvsignore 17 Feb 2010 13:11:08 -0000 1.4
@@ -1 +1 @@
-openscada-0.6.4.tar.gz
+openscada-0.6.4.1.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log 19 Oct 2009 07:48:42 -0000 1.8
+++ import.log 17 Feb 2010 13:11:08 -0000 1.9
@@ -6,3 +6,4 @@ openscada-0_6_3_3-6_fc10:F-10:openscada-
openscada-0_6_3_3-7_fc10:F-10:openscada-0.6.3.3-7.fc10.src.rpm:1245444145
openscada-0_6_4-1_fc11:F-10:openscada-0.6.4-1.fc11.src.rpm:1255427306
openscada-0_6_4-2_fc11:F-10:openscada-0.6.4-2.fc11.src.rpm:1255938537
+openscada-0_6_4_1-9_fc11:F-10:openscada-0.6.4.1-9.fc11.src.rpm:1266412262
Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openscada.spec 22 Oct 2009 12:03:36 -0000 1.14
+++ openscada.spec 17 Feb 2010 13:11:08 -0000 1.15
@@ -67,9 +67,9 @@
Summary: Open SCADA system project
Name: openscada
-Version: 0.6.4
-Release: 4%{?dist}
-Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
+Version: 0.6.4.1
+Release: 9%{?dist}
+Source0: ftp://oscada.org.ua/OpenSCADA/0.6.4/openscada-%version.tar.gz
# Init scripts for fedora
Patch0: oscada.init.patch
License: GPLv2
@@ -106,7 +106,9 @@ Requires(post): chkconfig
Requires(preun): chkconfig
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".
@@ -757,59 +759,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 +879,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}
@@ -988,9 +990,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
@@ -1042,9 +1044,9 @@ 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
+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
@@ -1082,9 +1084,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).
@@ -1101,47 +1103,45 @@ station (OpenSCADA).
%prep
%setup -q -n %{srcname}
%patch0 -p1 -b .fedora
-#%patch1 -p1 -b .openssl
-%{__sed} -i 's|/usr/lib/|%{_libdir}/|' data/oscada*.xml
%build
CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
%configure --disable-static \
- %{!?with_dcon:--disable-DCON} \
- %{!?with_diamondboards:--disable-DiamondBoards} \
- %{!?with_mysql:--disable-MySQL} \
- %{!?with_firebird:--disable-FireBird} \
- %{?with_firebird:--with-firebird=%{_libdir}/firebird} \
- %{!?with_dbf:--disable-DBF} \
- %{!?with_sqlite:--disable-SQLite} \
- %{!?with_webcfg:--disable-WebCfg} \
- %{!?with_webcfgd:--disable-WebCfgD} \
- %{!?with_webvision:--disable-WebVision} \
- %{!?with_http:--disable-HTTP} \
- %{!?with_modbus:--disable-ModBus} \
- %{!?with_soundcard:--disable-SoundCard} \
- %{!?with_qtcfg:--disable-QTCfg} \
- %{!?with_uivision:--disable-Vision} \
- %{!?with_uivcaengine:--disable-VCAEngine} \
- %{!?with_ssl:--disable-SSL} \
- %{!?with_serial:--disable-Serial} \
- %{!?with_sockets:--disable-Sockets} \
- %{!?with_snmp:--disable-SNMP} \
- %{!?with_siemens:--disable-Siemens} \
- %{!?with_dbarch:--disable-DBArch} \
- %{!?with_fsarch:--disable-FSArch} \
- %{!?with_system:--disable-System} \
- %{!?with_blockcalc:--disable-BlockCalc} \
- %{!?with_javalikecalc:--disable-JavaLikeCalc} \
- %{!?with_logiclevel:--disable-LogicLev} \
- %{!?with_daqgate:--disable-DAQGate} \
- %{!?with_icpdas:--disable-ICP_DAS} \
- %{!?with_selfsystem:--disable-SelfSystem} \
- %{!?with_flibcomplex:--disable-FlibComplex1} \
- %{!?with_flibmath:--disable-FlibMath} \
- %{!?with_flibsys:-disable-FlibSYS} \
- %{!?with_systemtests:--disable-SelfSystem} \
- %{!?with_qtstarter:--disable-QTStarter}
+%{!?with_dcon:--disable-DCON} \
+%{!?with_diamondboards:--disable-DiamondBoards} \
+%{!?with_mysql:--disable-MySQL} \
+%{!?with_firebird:--disable-FireBird} \
+%{?with_firebird:--with-firebird=%{_libdir}/firebird} \
+%{!?with_dbf:--disable-DBF} \
+%{!?with_sqlite:--disable-SQLite} \
+%{!?with_webcfg:--disable-WebCfg} \
+%{!?with_webcfgd:--disable-WebCfgD} \
+%{!?with_webvision:--disable-WebVision} \
+%{!?with_http:--disable-HTTP} \
+%{!?with_modbus:--disable-ModBus} \
+%{!?with_soundcard:--disable-SoundCard} \
+%{!?with_qtcfg:--disable-QTCfg} \
+%{!?with_uivision:--disable-Vision} \
+%{!?with_uivcaengine:--disable-VCAEngine} \
+%{!?with_ssl:--disable-SSL} \
+%{!?with_serial:--disable-Serial} \
+%{!?with_sockets:--disable-Sockets} \
+%{!?with_snmp:--disable-SNMP} \
+%{!?with_siemens:--disable-Siemens} \
+%{!?with_dbarch:--disable-DBArch} \
+%{!?with_fsarch:--disable-FSArch} \
+%{!?with_system:--disable-System} \
+%{!?with_blockcalc:--disable-BlockCalc} \
+%{!?with_javalikecalc:--disable-JavaLikeCalc} \
+%{!?with_logiclevel:--disable-LogicLev} \
+%{!?with_daqgate:--disable-DAQGate} \
+%{!?with_icpdas:--disable-ICP_DAS} \
+%{!?with_selfsystem:--disable-SelfSystem} \
+%{!?with_flibcomplex:--disable-FLibComplex1} \
+%{!?with_flibmath:--disable-FLibMath} \
+%{!?with_flibsys:-disable-FlibSYS} \
+%{!?with_systemtests:--disable-SelfSystem} \
+%{!?with_qtstarter:--disable-QTStarter}
make %{?_smp_mflags}
@@ -1179,6 +1179,8 @@ echo "OpenSCADA data dir" > %{buildroot}
echo "OpenSCADA messages archive dir" > %{buildroot}/var/spool/openscada/ARCHIVES/MESS/info
echo "OpenSCADA values archive dir" > %{buildroot}/var/spool/openscada/ARCHIVES/VAL/info
+%{__sed} -i 's|/usr/lib/|%{_libdir}/|' %{buildroot}%{_sysconfdir}/oscada*.xml
+
# installation of *.desktop files
%if 0%{?with_qtstarter}
desktop-file-install --dir=%{buildroot}%_desktopdir data/openscada.desktop
@@ -1205,7 +1207,7 @@ desktop-file-install --dir=%{buildroot}%
%{_initrddir}/openscadad
%{_bindir}/openscada
%{_bindir}/openscada_start
-%doc README README_ru COPYING ChangeLog
+%doc README README_ru README_uk COPYING ChangeLog INSTALL TODO TODO_ru TODO_uk
%{_libdir}/*.so.*
%{_libdir}/openscada/*.so
@@ -1446,19 +1448,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
@@ -1487,11 +1489,27 @@ desktop-file-install --dir=%{buildroot}%
%endif
%changelog
-* Thu Oct 22 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.6.4-4
-- Fixed the last broken dep
+* Wed Feb 17 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4.1-9
+- Fixed of dependencies in Obsoletes directives
+- Change of Source0 url path.
+
+* 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.
-* 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.
+* Sat Jan 9 2010 Aleksey Popkov <aleksey at oscada.org.ua> - 0.6.4-3
+- Fixed of libpath in the oscada_demo.xml.
* 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>.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 13 Oct 2009 09:48:24 -0000 1.4
+++ sources 17 Feb 2010 13:11:08 -0000 1.5
@@ -1 +1 @@
-9288241adecd71bd28a98695b7648965 openscada-0.6.4.tar.gz
+bbe6f8ec2978c205abb7671fec465c84 openscada-0.6.4.1.tar.gz
More information about the scm-commits
mailing list