rpms/openscada/F-10 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]

Author: aleksey2005

Update of /cvs/pkgs/rpms/openscada/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15804/F-10

Modified Files:
	import.log openscada.spec oscada.init.patch sources 
Log Message:
Fixed initscrips warning


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	15 Jun 2009 07:42:58 -0000	1.1
+++ import.log	15 Jun 2009 12:15:16 -0000	1.2
@@ -1 +1,2 @@
 openscada-0_6_3_3-1_fc10:F-10:openscada-0.6.3.3-1.fc10.src.rpm:1245051730
+openscada-0_6_3_3-2_fc10:F-10:openscada-0.6.3.3-2.fc10.src.rpm:1245068079


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openscada.spec	15 Jun 2009 07:42:58 -0000	1.1
+++ openscada.spec	15 Jun 2009 12:15:16 -0000	1.2
@@ -55,7 +55,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -73,7 +73,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,13 +102,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}
@@ -824,7 +828,7 @@ install -m 644 -pD data/oscada.xml %{bui
 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}
@@ -856,7 +860,7 @@ 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
@@ -1111,6 +1115,10 @@ desktop-file-install --dir=%{buildroot}%
 %{_localstatedir}/spool/openscada/DEMO/*.db
 
 %changelog
+* 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 +1129,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/F-10/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:42:58 -0000	1.1
+++ oscada.init.patch	15 Jun 2009 12:15:16 -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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Jun 2009 07:42:58 -0000	1.2
+++ sources	15 Jun 2009 12:15:16 -0000	1.3
@@ -1 +1 @@
-6c474b6c77b8fe9a7943d6c2c85bbd68  openscada-0.6.3.3.tar.gz
+f66f45c28ba9c50f0d38f8a2e76cd741  openscada-0.6.3.3.tar.gz