[matahari] New upstream release v0.6.0
Zane Bitter
zaneb at fedoraproject.org
Thu Dec 22 16:14:11 UTC 2011
commit 68ec3f72a07690c53a6936d981c1b00d2374f74b
Author: Zane Bitter <zbitter at redhat.com>
Date: Thu Dec 22 13:44:54 2011 +0100
New upstream release v0.6.0
Signed-off-by: Zane Bitter <zbitter at redhat.com>
.gitignore | 1 +
matahari-0.0.5-gcc-fix.patch | 50 -------------------
matahari-lsb.patch | 19 -------
matahari-no-qpidd.patch | 40 ---------------
matahari-qmf-lib.patch | 50 -------------------
matahari.spec | 112 ++++++++++++++++++++++++++++++++++++++++--
sources | 2 +-
7 files changed, 109 insertions(+), 165 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc4db1a..cd8a4d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ matahari-0.0.5.tar.gz
/matahari-matahari-f4a02ae.tgz
/matahari-matahari-94a4de1.tgz
/matahari-0.5.0.tar.gz
+/matahari-0.6.0.tar.gz
diff --git a/matahari.spec b/matahari.spec
index b459bab..e0bd536 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,5 +1,5 @@
%global specversion 1
-%global upstream_version ec3e35f
+%global upstream_version ffbaa6a
# Messaging buses
%bcond_without dbus
@@ -21,7 +21,7 @@
%endif
Name: matahari
-Version: 0.5.0
+Version: 0.6.0
Release: %{mh_release}%{?dist}
Summary: Matahari QMF Agents for Linux guests
@@ -43,6 +43,7 @@ Requires: %{name}-consoles = %{version}-%{release}
Requires: %{name}-broker = %{version}-%{release}
Requires: %{name}-host = %{version}-%{release}
Requires: %{name}-network = %{version}-%{release}
+Requires: %{name}-rpc = %{version}-%{release}
Requires: %{name}-service = %{version}-%{release}
Requires: %{name}-sysconfig = %{version}-%{release}
@@ -56,6 +57,7 @@ BuildRequires: libcurl-devel
BuildRequires: nss-devel
BuildRequires: help2man
BuildRequires: augeas-devel >= 0.9.0
+BuildRequires: python2-devel
%if %{with qmf}
BuildRequires: qpid-cpp-client-devel > 0.7
@@ -156,6 +158,24 @@ Requires: kstart
%description agent-lib
C++ library containing the base class for Matahari agents
+%package python
+License: GPLv2+
+Summary: Matahari Python API
+Group: Applications/System
+Requires: python-qpid-qmf
+
+%description python
+Python libraries for Matahari
+
+%package shell
+License: GPLv2+
+Summary: Matahari Shell (mhsh)
+Group: Applications/System
+Requires: %{name}-python = %{version}-%{release}
+
+%description shell
+Interactive shell for accessing Matahari agents
+
%package host
License: GPLv2+
Summary: QMF agent for remote hosts
@@ -168,6 +188,8 @@ Requires: dmidecode
Requires(post): chkconfig
Requires(preun):chkconfig
Requires(preun):initscripts
+# Power management functions in host agent require tuned
+Requires: tuned
%description host
QMF agent for viewing and controlling remote hosts
@@ -186,6 +208,20 @@ Obsoletes: matahari-net < %{version}-%{release}
%description network
QMF agent for viewing and controlling network devices
+%package rpc
+License: GPLv2+
+Summary: QMF agent for RPC plugins
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
+Requires: %{name}-python = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(preun):initscripts
+
+%description rpc
+QMF agent for dispatching RPC calls to plugins
+
%package service
License: GPLv2+
Summary: QMF agent for system services
@@ -221,7 +257,7 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-lib = %{version}-%{release}
Requires: %{name}-agent-lib = %{version}-%{release}
Requires: qpid-cpp-client-devel > 0.7
-Requires: qmf-devel > 0.7
+Requires: qpid-qmf-devel > 0.7
Requires: glib2-devel
%description devel
@@ -242,19 +278,20 @@ QMF console for monitoring various agents
%build
%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo %{!?with_qmf: -DWITH-QMF:BOOL=OFF} %{!?with_dbus: -DWITH-DBUS:BOOL=OFF} -Dinitdir=%{_initddir} -Dsysconfdir=%{_sysconfdir} .
-make %{?_smp_mflags}
+make -f Makefile %{?_smp_mflags}
%if %{defined run_unit_tests}
cd src/tests && ctest -V
%endif
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} -f Makefile install
%if %{systemd}
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-service
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-network
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-host
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-rpc
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-sysconfig
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-sysconfig-console
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-broker
@@ -317,6 +354,29 @@ if [ "$1" -ge "1" ]; then
/sbin/service matahari-network condrestart >/dev/null 2>&1 || :
fi
+#== RPC
+
+%post rpc
+%if %{systemd}
+systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add matahari-rpc
+%endif
+/sbin/service matahari-rpc condrestart
+
+%preun rpc
+if [ $1 = 0 ]; then
+ /sbin/service matahari-rpc stop >/dev/null 2>&1 || :
+%if !%{systemd}
+ chkconfig --del matahari-rpc
+%endif
+fi
+
+%postun rpc
+if [ "$1" -ge "1" ]; then
+ /sbin/service matahari-rpc condrestart >/dev/null 2>&1 || :
+fi
+
#== Services
%post service
@@ -458,6 +518,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{_libdir}/libmcommon.so.*
%{_libdir}/libmhost.so.*
%{_libdir}/libmnetwork.so.*
+%{_libdir}/libmrpc.so.*
%{_libdir}/libmservice.so.*
%{_libdir}/libmsysconfig.so.*
%doc AUTHORS COPYING
@@ -470,6 +531,25 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%dir %attr(0770, root, qpidd) %{_localstatedir}/lib/%{name}
%endif
+%files python
+%defattr(644, root, root, 755)
+%doc AUTHORS COPYING
+%dir %{python_sitelib}/matahari/
+%{python_sitelib}/matahari/*.py
+%{python_sitelib}/matahari/*.pyc
+%{python_sitelib}/matahari/*.pyo
+
+%files shell
+%defattr(644, root, root, 755)
+%doc AUTHORS COPYING
+%{_bindir}/mhsh
+%{python_sitelib}/matahari/shell/*.py
+%{python_sitelib}/matahari/shell/*.pyc
+%{python_sitelib}/matahari/shell/*.pyo
+%{python_sitelib}/matahari/shell/interpreter/*.py
+%{python_sitelib}/matahari/shell/interpreter/*.pyc
+%{python_sitelib}/matahari/shell/interpreter/*.pyo
+
%files network
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
@@ -518,6 +598,23 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{_datadir}/dbus-1/system-services/org.matahariproject.Host.service
%endif
+%files rpc
+%defattr(644, root, root, 755)
+%doc AUTHORS COPYING
+%attr(0755, -, -) %dir /usr/lib/matahari/plugins
+
+%if %{systemd}
+%{_unitdir}/matahari-rpc.service
+%endif
+
+%if %{with qmf}
+%if !%{systemd}
+%attr(755, root, root) %{_initddir}/matahari-rpc
+%endif
+%attr(755, root, root) %{_sbindir}/matahari-qmf-rpcd
+%{_mandir}/man8/matahari-qmf-rpcd.8*
+%endif
+
%files service
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
@@ -649,6 +746,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{_includedir}/matahari/dnssrv.h
%{_includedir}/matahari/host.h
%{_includedir}/matahari/network.h
+%{_includedir}/matahari/rpc.h
%{_includedir}/matahari/sysconfig.h
%{_includedir}/matahari/services.h
%{_datadir}/cmake/Modules/FindMatahari.cmake
@@ -656,6 +754,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%if %{with qmf}
%{_includedir}/matahari/agent.h
+%{_includedir}/matahari/object.h
%{_includedir}/matahari/mainloop.h
%{_datadir}/cmake/Modules/FindQPID.cmake
%endif
@@ -669,6 +768,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%endif
%changelog
+* Thu Dec 22 2011 Zane Bitter <zbitter at redhat.com> 0.6.0-1
+- New upstream release
+
* Fri Oct 21 2011 Adam Stokes <astokes at fedoraproject.org> 0.5.0
- New upstream release
diff --git a/sources b/sources
index c817d38..39d7b56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-322d3cfb39a73aff7cbda0fdd44287e3 matahari-0.5.0.tar.gz
+e3162ed4349c5f4650e80f695ca2114d matahari-0.6.0.tar.gz
More information about the scm-commits
mailing list