rpms/openscada/EL-4 import.log, 1.1, 1.2 openscada.spec, 1.1, 1.2 oscada.init.patch, 1.1, 1.2 sources, 1.2, 1.3

Popkov Aleksey aleksey2005 at fedoraproject.org
Wed Jun 17 19:42:35 UTC 2009 

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22301/EL-4

Modified Files:
	import.log openscada.spec oscada.init.patch sources 
Log Message:
Some fixed


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Jun 2009 07:51:09 -0000	1.1
+++ import.log	17 Jun 2009 19:42:04 -0000	1.2
@@ -1 +1,2 @@
 openscada-0_6_3_3-1_fc10:EL-4:openscada-0.6.3.3-1.fc10.src.rpm:1245052212
+openscada-0_6_3_3-5_fc10:EL-4:openscada-0.6.3.3-5.fc10.src.rpm:1245267685


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-4/openscada.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openscada.spec	15 Jun 2009 07:51:09 -0000	1.1
+++ openscada.spec	17 Jun 2009 19:42:04 -0000	1.2
@@ -1,7 +1,5 @@
 #===== Generic Info ======
 %define srcname openscada-%version
-%define _desktopdir %_datadir/applications
-%define _iconsdir /usr/share/icons
 # bcond_with "--disable compiling"
 # bcond_without "--enable compiling"
 # ======== DAQ =========
@@ -33,8 +31,18 @@
 # ========== HTTP Protocol =========
 %bcond_without http
 # ========== QT Interfaces ==========
+# QT4 devel old in to CentOs
+%if 0%{?rhel}
+%bcond_with qtstarter
+%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
+%endif
 # ========== Transports ==========
 %bcond_without ssl
 %bcond_without sockets
@@ -55,7 +63,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.3.3
-Release: 1%{?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
@@ -73,7 +81,11 @@ BuildRequires: sqlite-devel
 BuildRequires: byacc
 BuildRequires: bison
 BuildRequires: portaudio-devel
+%if 0%{?rhel}
+BuildRequires: qt4-devel
+%else
 BuildRequires: qt-devel
+%endif
 BuildRequires: lm_sensors-devel
 BuildRequires: openssl-devel
 BuildRequires: fftw-devel
@@ -98,14 +110,13 @@ Kennwort "openscada" benutzen.
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add oscadad
-/sbin/chkconfig oscadad off
+/sbin/chkconfig --add openscadad
+/sbin/chkconfig openscadad off
 
 %postun -p /sbin/ldconfig
 
 %preun
-/sbin/chkconfig --del oscadad
-
+/sbin/chkconfig --del openscadad
 
 %if 0%{?with_diamondboards}
 %package DAQ-DiamondBoards
@@ -301,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
@@ -514,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
@@ -739,8 +768,11 @@ Requires:%{name}-Transport-Sockets=%{ver
 Requires:%{name}-Transport-SSL=%{version}-%{release}
 Requires:%{name}-Transport-Serial=%{version}-%{release}
 
+%if 0%{?with_qtstarter}
+Requires:%{name}-UI-QTStarter=%{version}-%{release}
 Requires:%{name}-UI-QTCfg=%{version}-%{release}
 Requires:%{name}-UI-QTVision=%{version}-%{release}
+%endif
 
 Requires:%{name}-UI-WebCfg=%{version}-%{release}
 Requires:%{name}-UI-WebCfgd=%{version}-%{release}
@@ -803,7 +835,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
 	%{!?with_flibcomplex:--disable-FlibComplex1} \
 	%{!?with_flibmath:--disable-FlibMath} \
 	%{!?with_flibsys:-disable-FlibSYS} \
-	%{!?with_systemtests:--disable-SelfSystem}
+	%{!?with_systemtests:--disable-SelfSystem} \
+	%{!?with_qtstarter:--disable-QTStarter}
 
 make %{?_smp_mflags}
 
@@ -823,14 +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
-install -m 644 -pD data/openscada.png %{buildroot}%_iconsdir/openscada.png
-install -m 755 -pD data/oscada.init %{buildroot}%{_initrddir}/oscadad
+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
 
@@ -839,8 +874,10 @@ echo "OpenSCADA messages archive dir" > 
 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}
@@ -856,12 +893,10 @@ desktop-file-install --dir=%{buildroot}%
 %dir %{_localstatedir}/spool/openscada/ARCHIVES
 %dir %{_localstatedir}/spool/openscada/ARCHIVES/MESS
 %dir %{_localstatedir}/spool/openscada/ARCHIVES/VAL
-%{_initrddir}/oscadad
+%{_initrddir}/openscadad
 %{_bindir}/openscada
 %{_bindir}/openscada_start
 %doc README README_ru COPYING ChangeLog
-%_desktopdir/openscada.desktop
-%_iconsdir/openscada.png
 %{_libdir}/*.so.*
 %{_libdir}/openscada/*.so
 
@@ -1041,6 +1076,15 @@ desktop-file-install --dir=%{buildroot}%
 %{_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)
@@ -1106,11 +1150,28 @@ desktop-file-install --dir=%{buildroot}%
 %config(noreplace) %{_sysconfdir}/oscada_demo.xml
 %dir %{_localstatedir}/spool/openscada/DEMO
 %{_bindir}/openscada_demo
+%{_localstatedir}/spool/openscada/DEMO/*.db
+%if 0%{?with_qtstarter}
 %_desktopdir/openscada_demo.desktop
 %_iconsdir/openscada_demo.png
-%{_localstatedir}/spool/openscada/DEMO/*.db
+%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)
+- Fixed oscada.init.patch for cases messages.
+
+* Thu Jun 11 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-2
+- Fixed incoherent-init-script-name warning of rename init scripts from oscadad to openscadad by Popkov Aleksey
+- Fixed incoherent-subsys error of rename into init scripts from lockfile=/var/lock/subsys/oscadad to lockfile=/var/lock/subsys/openscadad by Popkov Aleksey.
+
 * Wed Jun 10 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-1
 - Release OpenSCADA 0.6.3.3.
 - Added self modules of daq_DAQGate and tr_Serial.
@@ -1121,18 +1182,18 @@ desktop-file-install --dir=%{buildroot}%
 - Prerelease OpenSCADA 0.6.3.3 (svn ver. 902)
 - Fixed issue with find_lang
 - Removal, of some unneded files by Peter Lemenkov <lemenkov at gmail.com>
-- Translated description to Germany language by Popkova Irina.
+- Translated description to German language by Popkova Irina.
 
 * Thu Jun 4 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-0.1.svn901
 - Prerelease OpenSCADA 0.6.3.3 (svn ver. 901)
-- Translated description to Germany language by Popkova Irina.
+- Translated description to German language by Popkova Irina.
 
 * Wed Jun 3 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.3-0.1.svn899
 - Adaptated for release OpenSCADA 0.6.3.3.
 
 * Thu May 26 2009 Popkov Aleksey <aleksey at oscada.org.ua> 0.6.3.2-2
 - OpenSCADA build for Fedora.
-- Translated description to Germany language by Popkova Irina.
+- Translated description to German language by Popkova Irina.
 
 * Wed Mar 18 2009 Roman Savochenko <rom_as at diyaorg.dp.ua>
 - OpenSCADA update 0.6.3.2 release build.

oscada.init.patch:

Index: oscada.init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-4/oscada.init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- oscada.init.patch	15 Jun 2009 07:51:09 -0000	1.1
+++ oscada.init.patch	17 Jun 2009 19:42:04 -0000	1.2
@@ -18,7 +18,7 @@ index 21744dd..cdecaf8 100644
 -LOCKFILE=/var/lock/subsys/openscada
 -OPENSCADA=/usr/bin/openscada
 +bindir=/usr/bin
-+lockfile=/var/lock/subsys/oscadad
++lockfile=/var/lock/subsys/openscadad
 +OPENSCADA_BIN=${bindir}/openscada
  ARGS="--demon &> /dev/null"
  RETVAL=0
@@ -85,7 +85,7 @@ index 21744dd..cdecaf8 100644
 -		msg_usage "${0##*/} {start|stop|restart|condstop|condrestart|status}"
 -		RETVAL=1
 +		*)
-+		msg_usage $"Usage: $0 {start|stop|restart|condstop|condrestart|status}"
++		echo $"Usage: $0 {start|stop|restart|condstop|condrestart|status}"
 +		RETVAL=2
  esac
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jun 2009 07:51:09 -0000	1.2
+++ sources	17 Jun 2009 19:42:05 -0000	1.3
@@ -1 +1 @@
-6c474b6c77b8fe9a7943d6c2c85bbd68  openscada-0.6.3.3.tar.gz
+f66f45c28ba9c50f0d38f8a2e76cd741  openscada-0.6.3.3.tar.gz

More information about the fedora-extras-commits mailing list