[openscada/f14] ver. 0.8.0
Popkov Aleksey
aleksey2005 at fedoraproject.org
Tue Apr 10 09:03:41 UTC 2012
commit 89717249b1be4a282e8b2a39ab333514033094f3
Author: aleksey <aleksey at popkov.psniip.local>
Date: Tue Apr 10 13:03:11 2012 +0400
ver. 0.8.0
.gitignore | 2 ++
openscada.spec | 33 +++++++++++++++++++--------------
sources | 4 ++--
3 files changed, 23 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5df02f..d381437 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ openscada-0.6.4.2.tar.gz
/openscada-res-0.7.1.tar.lzma
/openscada-0.7.2.tar.lzma
/openscada-res-0.7.2.tar.lzma
+/openscada-0.8.0.tar.lzma
+/openscada-res-0.8.0.tar.lzma
diff --git a/openscada.spec b/openscada.spec
index 5bc201e..6781c44 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -79,31 +79,27 @@
Summary: Open SCADA system project
Name: openscada
-Version: 0.7.2
+Version: 0.8.0
Release: 1%{?dist}
-Source0: ftp://oscada.org/OpenSCADA/0.7.1/openscada-%version.tar.lzma
-Source1: ftp://oscada.org/OpenSCADA/0.7.1/openscada-res-%version.tar.lzma
+Source0: ftp://oscada.org/OpenSCADA/0.8.0/openscada-%version.tar.lzma
+Source1: ftp://oscada.org/OpenSCADA/0.8.0/openscada-res-%version.tar.lzma
# Need to delete
# Init scripts for fedora
#Patch0: oscada.init.patch
#
License: GPLv2
Group: Applications/Engineering
-URL: http://oscada.org.ua
+URL: http://oscada.org
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# has some x86-assembly includes
ExclusiveArch: %{ix86} x86_64
BuildRequires: gettext
BuildRequires: gd-devel
-#BuildRequires: expat-devel
BuildRequires: byacc
BuildRequires: bison
-%if 0%{?rhel}
BuildRequires: qt4-devel
-%else
BuildRequires: qt-devel
-%endif
BuildRequires: openssl-devel
BuildRequires: fftw-devel
BuildRequires: autoconf
@@ -767,7 +763,6 @@ OpenSCADA-Systemkonfigurator.
%endif
############################### UI-System ##################################
-
%if 0%{?with_uivision}
%package UI-Vision
Summary: Open SCADA QT interfaces
@@ -1370,7 +1365,8 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
%{!?with_icpdas:--disable-ICP_DAS} \
%{!?with_opcua:--disable-OPC_UA} \
%{!?with_amrdevs:--disable-AMRDevs} \
-%{!?with_bfn:--disable-BFN} \
+%{!?with_bfn:--disabled-BFN} \
+%{!?without_bfn:--enable-BFN} \
%{!?with_selfsystem:--disable-SelfSystem} \
%{!?with_userprotocol:--disable-UserProtocol} \
%{!?with_flibcomplex:--disable-FLibComplex1} \
@@ -1393,15 +1389,12 @@ rm -f %{buildroot}%{_libdir}/*.*a
rm -f %{buildroot}%{_libdir}/openscada/*.*a
%{__install} -m 755 -d %{buildroot}%{_includedir}/openscada/
-%{__install} -m 644 *.h %{buildroot}%{_includedir}/openscada
+# %{__install} -m 644 *.h %{buildroot}%{_includedir}/openscada
%{__install} -m 644 src/*.h %{buildroot}%{_includedir}/openscada
%{__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 755 -pD data/oscada_RH.init %{buildroot}%{_initrddir}/openscadad
-# Need to delete
-#%{__install} -m 755 -pD data/oscada_RH.init %{buildroot}%{_initrddir}/openscadad
-#
%{__install} -m 755 -d %{buildroot}/var/spool/openscada/{DATA,icons,LibsDB,AGLKS,Boiler}
%{__install} -m 644 data/icons/* %{buildroot}/var/spool/openscada/icons
%{__install} -m 755 -d %{buildroot}/var/spool/openscada/ARCHIVES/{MESS,VAL}
@@ -1895,6 +1888,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/%_desktopdir data
%dir %{_includedir}/openscada
%{_libdir}/*.so
%{_includedir}/openscada/*
+%{_libdir}/pkgconfig/openscada.pc
%files LibDB-Main
%defattr(-,root,root)
@@ -1923,6 +1917,17 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/%_desktopdir data
%{_localstatedir}/spool/openscada/Boiler/*.db
%changelog
+* Mon Apr 09 2012 Aleksey Popkov <aleksey at oscada.org>
+- Build 0.8.0 release.
+
+* Wed Dec 8 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.2-3
+- Fixed of source code for build on the el5.
+- Fixed of Source0 and Source1 directives.
+- Some cosmetics.
+
+* Wed Dec 8 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.2-2
+- Some cosmetics.
+
* Wed Dec 7 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.2-1
- Build reliase 0.7.2.
- Removed to patch for init script.
diff --git a/sources b/sources
index dee9b9d..e34ab21 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-87d18289a1858df0d16da15cf25337d7 openscada-0.7.2.tar.lzma
-b6cd6b9523da9835bfc573b8dd87ae7c openscada-res-0.7.2.tar.lzma
+15d07baab9bdbce7d56ddc270d88a74b openscada-0.8.0.tar.lzma
+c89eaeb455b78f37c629880781fcc826 openscada-res-0.8.0.tar.lzma
More information about the scm-commits
mailing list