rpms/openscada/devel .cvsignore, 1.3, 1.4 import.log, 1.9, 1.10 openscada.spec, 1.17, 1.18 sources, 1.3, 1.4

[Popkov Aleksey]

Author: aleksey2005

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Oct 2009 09:50:17 -0000	1.3
+++ .cvsignore	26 Jan 2010 12:27:53 -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/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	19 Oct 2009 14:42:15 -0000	1.9
+++ import.log	26 Jan 2010 12:27:53 -0000	1.10
@@ -7,3 +7,4 @@ openscada-0_6_3_3-7_fc10:HEAD:openscada-
 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
+openscada-0_6_4_1-4_fc11:HEAD:openscada-0.6.4.1-4.fc11.src.rpm:1264508836


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- openscada.spec	22 Oct 2009 12:03:36 -0000	1.17
+++ openscada.spec	26 Jan 2010 12:27:53 -0000	1.18
@@ -67,7 +67,7 @@
 
 Summary: Open SCADA system project
 Name: openscada
-Version: 0.6.4
+Version: 0.6.4.1
 Release: 4%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
@@ -978,9 +978,7 @@ 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
@@ -1012,15 +1010,11 @@ 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
@@ -1028,9 +1022,7 @@ 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
@@ -1042,8 +1034,8 @@ 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-FLibComplex1
+Requires: %{name} Special-FLibMath
 Requires: %{name}-Special-FlibSys
 %description server
 The %name-server package is virtual package for OpenSCADA-server.
@@ -1082,9 +1074,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 +1093,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 +1169,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 +1197,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
 
@@ -1487,11 +1479,11 @@ 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
+* 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/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Oct 2009 09:50:17 -0000	1.3
+++ sources	26 Jan 2010 12:27:53 -0000	1.4
@@ -1 +1 @@
-9288241adecd71bd28a98695b7648965  openscada-0.6.4.tar.gz
+bbe6f8ec2978c205abb7671fec465c84  openscada-0.6.4.1.tar.gz