rpms/openscada/F-10 import.log, 1.2, 1.3 openscada.spec, 1.2, 1.3 oscada.init.patch, 1.2, 1.3

Popkov Aleksey aleksey2005 at fedoraproject.org
Wed Jun 17 13:19:04 UTC 2009 

Author: aleksey2005

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

Modified Files:
	import.log openscada.spec oscada.init.patch 
Log Message:
Adapted for 5E and some fixed


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 12:15:16 -0000	1.2
+++ import.log	17 Jun 2009 13:18:33 -0000	1.3
@@ -1,2 +1,3 @@
 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
+openscada-0_6_3_3-3_fc10:F-10:openscada-0.6.3.3-3.fc10.src.rpm:1245244670


Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/openscada.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openscada.spec	15 Jun 2009 12:15:16 -0000	1.2
+++ openscada.spec	17 Jun 2009 13:18:33 -0000	1.3
@@ -1,14 +1,13 @@
 #===== Generic Info ======
 %define srcname openscada-%version
-%define _desktopdir %_datadir/applications
-%define _iconsdir /usr/share/icons
 # bcond_with "--disable compiling"
 # bcond_without "--enable compiling"
 # ======== DAQ =========
 %bcond_with diamondboards
 %bcond_without dcon
 %bcond_without modbus
-%bcond_without soundcard
+# Portaudio-devel not preset in to CentOs
+%bcond_with soundcard
 %bcond_without snmp
 %bcond_without siemens
 %bcond_without system
@@ -33,8 +32,18 @@
 # ========== HTTP Protocol =========
 %bcond_without http
 # ========== QT Interfaces ==========
+# QT4 devel old in to CentOs
+%bcond_with qtstarter
+%if 0%{?rhel} && 0%{?with_qtstarter}
+# Don't change it's
 %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
 %bcond_without sockets
@@ -55,7 +64,7 @@
 Summary: Open SCADA system project
 Name: openscada
 Version: 0.6.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://oscada.org.ua/OpenSCADA/0.6.3/openscada-%version.tar.gz
 # Init scripts for fedora
 Patch0: oscada.init.patch
@@ -72,7 +81,9 @@ 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
@@ -743,13 +754,21 @@ Requires:%{name}-Transport-Sockets=%{ver
 Requires:%{name}-Transport-SSL=%{version}-%{release}
 Requires:%{name}-Transport-Serial=%{version}-%{release}
 
-Requires:%{name}-UI-QTCfg=%{version}-%{release}
-Requires:%{name}-UI-QTVision=%{version}-%{release}
-
 Requires:%{name}-UI-WebCfg=%{version}-%{release}
 Requires:%{name}-UI-WebCfgd=%{version}-%{release}
 Requires:%{name}-UI-WebVision=%{version}-%{release}
 
+%if 0%{?with_qtcfg}
+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
+
 %description demo
 The %{name}-demo package includes demo data bases and configs.
 For start use command <openscada_demo>. For access use account
@@ -807,7 +826,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}
 
@@ -827,14 +847,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
-install -m 644 -pD demo/openscada_demo.png %{buildroot}%_iconsdir/openscada_demo.png
 install -m 755 -d %{buildroot}/var/spool/openscada/DEMO
 install -m 644 demo/*.db %{buildroot}/var/spool/openscada/DEMO
 
@@ -842,10 +864,6 @@ 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
-desktop-file-install --dir=%{buildroot}%_desktopdir data/openscada.desktop
-desktop-file-install --dir=%{buildroot}%_desktopdir demo/openscada_demo.desktop
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -864,8 +882,12 @@ desktop-file-install --dir=%{buildroot}%
 %{_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
 
@@ -893,6 +915,7 @@ desktop-file-install --dir=%{buildroot}%
 %{?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}
@@ -1057,6 +1080,13 @@ desktop-file-install --dir=%{buildroot}%
 %{_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)
@@ -1110,11 +1140,18 @@ desktop-file-install --dir=%{buildroot}%
 %config(noreplace) %{_sysconfdir}/oscada_demo.xml
 %dir %{_localstatedir}/spool/openscada/DEMO
 %{_bindir}/openscada_demo
-%_desktopdir/openscada_demo.desktop
-%_iconsdir/openscada_demo.png
 %{_localstatedir}/spool/openscada/DEMO/*.db
+%if 0%{?with_qtstarter}
+    %_desktopdir/openscada_demo.desktop
+    %_iconsdir/openscada_demo.png
+%endif
 
 %changelog
+* 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.

oscada.init.patch:

Index: oscada.init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/F-10/oscada.init.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- oscada.init.patch	15 Jun 2009 12:15:16 -0000	1.2
+++ oscada.init.patch	17 Jun 2009 13:18:34 -0000	1.3
@@ -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

More information about the fedora-extras-commits mailing list