[openscada/f16] ver. 0.7.2
Popkov Aleksey
aleksey2005 at fedoraproject.org
Thu Dec 8 06:19:46 UTC 2011
commit c043051dc74be32b0fb12f9d1bddf26f007f14a9
Author: aleksey <aleksey at popkov.psniip.local>
Date: Thu Dec 8 10:20:37 2011 +0400
ver. 0.7.2
.gitignore | 2 +
openscada.spec | 24 +++++++--------
oscada.init.patch | 83 -----------------------------------------------------
sources | 4 +-
4 files changed, 15 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4691d4..e5df02f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ openscada-0.6.4.2.tar.gz
/openscada-0.7.0.2.tar.gz
/openscada-0.7.1.tar.lzma
/openscada-res-0.7.1.tar.lzma
+/openscada-0.7.2.tar.lzma
+/openscada-res-0.7.2.tar.lzma
diff --git a/openscada.spec b/openscada.spec
index 6840e54..a1c41cb 100644
--- a/openscada.spec
+++ b/openscada.spec
@@ -79,18 +79,18 @@
Summary: Open SCADA system project
Name: openscada
-Version: 0.7.1
-Release: 6%{?dist}
+Version: 0.7.2
+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
# Need to delete
# Init scripts for fedora
-Patch0: oscada.init.patch
-
+#Patch0: oscada.init.patch
+#
License: GPLv2
Group: Applications/Engineering
URL: http://oscada.org.ua
-
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# has some x86-assembly includes
ExclusiveArch: %{ix86} x86_64
@@ -99,11 +99,8 @@ 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
@@ -1330,7 +1327,7 @@ station (OpenSCADA).
%setup -q -n %{srcname}
%setup -T -D -a 1
# Need to delete
-%patch0 -p1 -b .fedora
+#%patch0 -p1 -b .fedora
#
%build
@@ -1398,7 +1395,7 @@ rm -f %{buildroot}%{_libdir}/openscada/*.*a
%{__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.init %{buildroot}%{_initrddir}/openscadad
+%{__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
#
@@ -1439,7 +1436,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/%_desktopdir data
%{__rm} -rf %{buildroot}
%files -f %{name}.lang
-
+
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/oscada.xml
%config(noreplace) %{_sysconfdir}/oscada_start.xml
@@ -1923,8 +1920,9 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/%_desktopdir data
%{_localstatedir}/spool/openscada/Boiler/*.db
%changelog
-* Tue Oct 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.7.1-6
-- Rebuild for netsnmp soname bump
+* 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.
* Wed Sep 14 2011 Aleksey Popkov <aleksey at oscada.org> - 0.7.1-5
- Adding of directive Obsoletes for demo package.
diff --git a/sources b/sources
index fc95d45..dee9b9d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bd14e826a6d915356d9942502b70b765 openscada-0.7.1.tar.lzma
-c59564dec6d325ed7631dee684089b0e openscada-res-0.7.1.tar.lzma
+87d18289a1858df0d16da15cf25337d7 openscada-0.7.2.tar.lzma
+b6cd6b9523da9835bfc573b8dd87ae7c openscada-res-0.7.2.tar.lzma
More information about the scm-commits
mailing list