rpms/openscada/devel import.log,1.3,1.4 openscada.spec,1.3,1.4

[Popkov Aleksey]

Author: aleksey2005

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

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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	17 Jun 2009 13:21:55 -0000	1.3
+++ import.log	17 Jun 2009 19:29:08 -0000	1.4
@@ -1,3 +1,4 @@
 openscada-0_6_3_3-1_fc10:HEAD:openscada-0.6.3.3-1.fc10.src.rpm:1245053526
 openscada-0_6_3_3-2_fc10:HEAD:openscada-0.6.3.3-2.fc10.src.rpm:1245068881
 openscada-0_6_3_3-3_fc10:HEAD:openscada-0.6.3.3-3.fc10.src.rpm:1245244841
+openscada-0_6_3_3-5_fc10:HEAD:openscada-0.6.3.3-5.fc10.src.rpm:1245266909


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/devel/openscada.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openscada.spec	17 Jun 2009 13:21:55 -0000	1.3
+++ openscada.spec	17 Jun 2009 19:29:08 -0000	1.4
@@ -6,8 +6,7 @@
 %bcond_with diamondboards
 %bcond_without dcon
 %bcond_without modbus
-# Portaudio-devel not preset in to CentOs
-%bcond_with soundcard
+%bcond_without soundcard
 %bcond_without snmp
 %bcond_without siemens
 %bcond_without system
@@ -33,16 +32,16 @@
 %bcond_without http
 # ========== QT Interfaces ==========
 # QT4 devel old in to CentOs
+%if 0%{?rhel}
 %bcond_with qtstarter
-%if 0%{?rhel} && 0%{?with_qtstarter}
-# Don't change it's
+%bcond_with qtcfg
+%bcond_with qtvision
+%else
+%bcond_without qtstarter
 %bcond_without qtcfg
 %bcond_without qtvision
 %define _desktopdir %_datadir/applications
 %define _iconsdir /usr/share/icons
-%else
-%bcond_with qtcfg
-%bcond_with qtvision
 %endif
 # ========== Transports ==========
 %bcond_without ssl
@@ -64,7 +63,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.3.3
-Release: 3%{?dist}
+Release: 5%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -81,9 +80,7 @@ BuildRequires: expat-devel
 BuildRequires: sqlite-devel
 BuildRequires: byacc
 BuildRequires: bison
-%if 0%{?with_soundcard}
 BuildRequires: portaudio-devel
-%endif
 %if 0%{?rhel}
 BuildRequires: qt4-devel
 %else
@@ -121,7 +118,6 @@ Kennwort "openscada" benutzen.
 %preun
 /sbin/chkconfig --del openscadad
 
-
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
 Summary: Open SCADA DAQ
@@ -316,7 +312,6 @@ The %name-DAQ-LogicLevel allows logic le
 Das Paket %name-DAQ-LogicLevel, enthaelt das logische Parameterlevel.
 %endif
 
-
 %if 0%{?with_daqgate}
 %package DAQ-Gate
 Summary: Open SCADA DAQ
@@ -529,6 +524,25 @@ Das Paket %name-Protocol-HTTP ermoeglich
 WWW-basierenden Nutzersinterfaces .
 %endif
 
+%if 0%{?with_qtstarter}
+%package UI-QTStarter
+Summary: Open SCADA QT Starter
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-QTStarter
+The %name-UI-QTStarter Allow QT GUI starter. It is single for
+all QT GUI modules!.
+%description UI-QTStarter -l ru_RU.UTF8
+Пакет %name-UI-QTStarter Предоставляет QT GUI пускатель.
+Он является единственным для всех QT GUI модулей!
+%description UI-QTStarter -l uk_UA.UTF8
+Пакет %name-UI-QTStarter Надає QT GUI пускач. Він є один для
+усіх QT GUI модулів!
+%description UI-QTStarter -l de_DE.UTF8
+Das Paket %name-UI-QTStarter  Enthaelt den QT GUI Starter.
+Ist das einzige fuer alle QT GUI Module!
+%endif
+
 %if 0%{?with_qtcfg}
 %package UI-QTCfg
 Summary: Open SCADA QT interfaces
@@ -754,20 +768,15 @@ Requires:%{name}-Transport-Sockets=%{ver
 Requires:%{name}-Transport-SSL=%{version}-%{release}
 Requires:%{name}-Transport-Serial=%{version}-%{release}
 
-Requires:%{name}-UI-WebCfg=%{version}-%{release}
-Requires:%{name}-UI-WebCfgd=%{version}-%{release}
-Requires:%{name}-UI-WebVision=%{version}-%{release}
-
-%if 0%{?with_qtcfg}
+%if 0%{?with_qtstarter}
+Requires:%{name}-UI-QTStarter=%{version}-%{release}
 Requires:%{name}-UI-QTCfg=%{version}-%{release}
-%endif
-%if 0%{?with_qtvision}
 Requires:%{name}-UI-QTVision=%{version}-%{release}
 %endif
 
-%if 0%{?with_qtstarter}
-desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
-%endif
+Requires:%{name}-UI-WebCfg=%{version}-%{release}
+Requires:%{name}-UI-WebCfgd=%{version}-%{release}
+Requires:%{name}-UI-WebVision=%{version}-%{release}
 
 %description demo
 The %{name}-demo package includes demo data bases and configs.
@@ -847,16 +856,16 @@ install -m 644 src/*.h %{buildroot}%{_in
 install -m 644 -pD data/oscada.xml %{buildroot}%{_sysconfdir}/oscada.xml
 install -m 644 -pD data/oscada_start.xml %{buildroot}%{_sysconfdir}/oscada_start.xml
 install -m 755 -pD data/openscada_start %{buildroot}%{_bindir}/openscada_start
-%if 0%{?with_qtstarter}
-install -m 644 -pD data/openscada.png %{buildroot}%_iconsdir/openscada.png
-install -m 644 -pD demo/openscada_demo.png %{buildroot}%_iconsdir/openscada_demo.png
-%endif
 install -m 755 -pD data/oscada.init %{buildroot}%{_initrddir}/openscadad
 install -m 755 -d %{buildroot}/var/spool/openscada/{DATA,icons}
 install -m 644 data/icons/* %{buildroot}/var/spool/openscada/icons
 install -m 755 -d %{buildroot}/var/spool/openscada/ARCHIVES/{MESS,VAL}
 install -m 644 -pD demo/oscada_demo.xml %{buildroot}%{_sysconfdir}/oscada_demo.xml
 install -m 755 -pD demo/openscada_demo %{buildroot}%{_bindir}/openscada_demo
+%if 0%{?with_qtstarter}
+install -m 644 -pD demo/openscada_demo.png %{buildroot}%_iconsdir/openscada_demo.png
+install -m 644 -pD data/openscada.png %{buildroot}%_iconsdir/openscada.png
+%endif
 install -m 755 -d %{buildroot}/var/spool/openscada/DEMO
 install -m 644 demo/*.db %{buildroot}/var/spool/openscada/DEMO
 
@@ -864,6 +873,12 @@ 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
 
+# installation of *.desktop files
+%if 0%{?with_qtstarter}
+desktop-file-install --dir=%{buildroot}%_desktopdir data/openscada.desktop
+desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
+%endif
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -882,12 +897,6 @@ echo "OpenSCADA values archive dir" > %{
 %{_bindir}/openscada
 %{_bindir}/openscada_start
 %doc README README_ru COPYING ChangeLog
-
-%if 0%{?with_qtstarter}
-%_desktopdir/openscada.desktop
-%_iconsdir/openscada.png
-%endif
-
 %{_libdir}/*.so.*
 %{_libdir}/openscada/*.so
 
@@ -915,7 +924,6 @@ echo "OpenSCADA values archive dir" > %{
 %{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
 %{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
 %{?with_qtvision: %exclude %{_libdir}/openscada/ui_Vision.so}
-%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_SSL.so}
 %{?with_sockets: %exclude %{_libdir}/openscada/tr_Sockets.so}
 %{?with_ssl: %exclude %{_libdir}/openscada/tr_Serial.so}
@@ -1068,6 +1076,15 @@ echo "OpenSCADA values archive dir" > %{
 %{_libdir}/openscada/prot_HTTP.so
 %endif
 
+%if 0%{?with_qtstarter}
+%files UI-QTStarter
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_QTStarter.so
+%_desktopdir/openscada.desktop
+%_desktopdir/openscada_demo.desktop
+%_iconsdir/openscada.png
+%endif
+
 %if 0%{?with_qtcfg}
 %files UI-QTCfg
 %defattr(-,root,root)
@@ -1080,13 +1097,6 @@ echo "OpenSCADA values archive dir" > %{
 %{_libdir}/openscada/ui_Vision.so
 %endif
 
-%if 0%{?with_qtstarter}
-%files UI-QTStarter
-%defattr(-,root,root)
-%{_libdir}/openscada/ui_QTStartter.so
-desktop-file-install --dir=%{buildroot}%_desktopdir data/openscada.desktop
-%endif
-
 %if 0%{?with_ssl}
 %files Transport-SSL
 %defattr(-,root,root)
@@ -1142,11 +1152,17 @@ desktop-file-install --dir=%{buildroot}%
 %{_bindir}/openscada_demo
 %{_localstatedir}/spool/openscada/DEMO/*.db
 %if 0%{?with_qtstarter}
-    %_desktopdir/openscada_demo.desktop
-    %_iconsdir/openscada_demo.png
+%_desktopdir/openscada_demo.desktop
+%_iconsdir/openscada_demo.png
 %endif
 
 %changelog
+* Wed Jun 17 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-5
+- Fixed critical bugs maked by me.
+
+* Tue Jun 16 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-4
+- Enabled Portaudio-devel library by Popkov Aleksey.
+
 * Tue Jun 16 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-3
 - Adapted spec file for dist 5E-epel by Popkov Aleksey
 - Adapted spec file for dist 4E-epel by Popkov Aleksey (Not tested)