[matahari] - New upstream release
Adam Stokes
astokes at fedoraproject.org
Fri Oct 21 15:42:27 UTC 2011
commit 5480139af9cb745192b1250fb28cb8a9bfd16e2c
Author: Adam Stokes <astokes at fedoraproject.org>
Date: Fri Oct 21 11:42:02 2011 -0400
- New upstream release
.gitignore | 1 +
matahari.spec | 322 ++++++++++++++++++++++++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 231 insertions(+), 94 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2ef4f7..bc4db1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ matahari-0.0.5.tar.gz
/matahari-matahari-59d1fe1.tgz
/matahari-matahari-f4a02ae.tgz
/matahari-matahari-94a4de1.tgz
+/matahari-0.5.0.tar.gz
diff --git a/matahari.spec b/matahari.spec
index e645bd5..5f8cd47 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,5 +1,5 @@
-%global specversion 2
-%global upstream_version 94a4de1
+%global specversion 1
+%global upstream_version ec3e35f
# Messaging buses
%bcond_without dbus
@@ -20,53 +20,54 @@
%global mh_release %{specversion}
%endif
-Name: matahari
-Version: 0.4.7
-Release: %{mh_release}%{?dist}
-Summary: Matahari QMF Agents for Linux guests
+Name: matahari
+Version: 0.5.0
+Release: %{mh_release}%{?dist}
+Summary: Matahari QMF Agents for Linux guests
-Group: Applications/System
-License: GPLv2
-URL: http://matahariproject.org
+Group: Applications/System
+License: GPLv2
+URL: http://matahariproject.org
# wget --no-check-certificate -O matahari-matahari-{upstream_version}.tgz https://github.com/matahari/matahari/tarball/{upstream_version}
-Source0: matahari-matahari-%{upstream_version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: matahari-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# NOTE: The host API uses dbus for the machine uuid
-Requires: dbus
-Requires: qmf > 0.7
-Requires: pcre
-
-Requires: %{name}-core = %{version}-%{release}
-Requires: %{name}-consoles = %{version}-%{release}
-Requires: %{name}-broker = %{version}-%{release}
-Requires: %{name}-host = %{version}-%{release}
-Requires: %{name}-network = %{version}-%{release}
-Requires: %{name}-service = %{version}-%{release}
-Requires: %{name}-sysconfig = %{version}-%{release}
-
-BuildRequires: cmake
-BuildRequires: libuuid-devel
-BuildRequires: gcc-c++
-BuildRequires: pcre-devel
-BuildRequires: glib2-devel
-BuildRequires: sigar-devel > 1.6.5-0.2
-BuildRequires: libcurl-devel
-BuildRequires: help2man
-BuildRequires: augeas-devel >= 0.9.0
+Requires: dbus
+Requires: qmf > 0.7
+Requires: pcre
+
+Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-consoles = %{version}-%{release}
+Requires: %{name}-broker = %{version}-%{release}
+Requires: %{name}-host = %{version}-%{release}
+Requires: %{name}-network = %{version}-%{release}
+Requires: %{name}-service = %{version}-%{release}
+Requires: %{name}-sysconfig = %{version}-%{release}
+
+BuildRequires: cmake
+BuildRequires: libuuid-devel
+BuildRequires: gcc-c++
+BuildRequires: pcre-devel
+BuildRequires: glib2-devel
+BuildRequires: sigar-devel
+BuildRequires: libcurl-devel
+BuildRequires: nss-devel
+BuildRequires: help2man
+BuildRequires: augeas-devel >= 0.9.0
%if %{with qmf}
-BuildRequires: qpid-cpp-client-devel > 0.7
-BuildRequires: qmf-devel > 0.7
+BuildRequires: qpid-cpp-client-devel > 0.7
+BuildRequires: qpid-qmf-devel > 0.7
%endif
%if %{with dbus}
-BuildRequires: dbus-devel dbus-glib-devel polkit-devel libxslt
+BuildRequires: dbus-devel dbus-glib-devel polkit-devel libxslt
%endif
%if %{defined run_unit_tests}
-BuildRequires: cxxtest
+BuildRequires: cxxtest
%endif
%description
@@ -83,113 +84,155 @@ as a set of objects with properties and methods.
%package core
-License: GPLv2+
-Summary: Core files for Matahari
-Group: Applications/System
+License: GPLv2+
+Summary: Core files for Matahari
+Group: Applications/System
%description core
Core files for Matahari
%if %{with qmf}
%package broker
-License: GPLv2+
-Summary: Optional AMQP Broker for Matahari
-Group: Applications/System
-Requires: %{name}-core = %{version}-%{release}
-Requires: qpid-cpp-server > 0.7
-Requires: qpid-cpp-server-ssl > 0.7
-Requires: qmf > 0.7
+License: GPLv2+
+Summary: Optional AMQP Broker for Matahari
+Group: Applications/System
+Requires: %{name}-core = %{version}-%{release}
+Requires: qpid-cpp-server > 0.7
+Requires: qpid-cpp-server-ssl > 0.7
+Requires: qmf > 0.7
+Requires: qpid-tools
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(preun):initscripts
%description broker
Optional AMQP Broker for Matahari
%endif
+%package vios-proxy-host
+License: ASL 2.0
+Summary: Network proxy using virtioserial for QEMU host
+Group: Applications/System
+Requires: %{name}-broker = %{version}-%{release}
+Requires: vios-proxy-host
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
+%description vios-proxy-host
+%{name} specific host initialization scripts
+
+%package vios-proxy-guest
+License: ASL 2.0
+Summary: Network proxy using virtioserial for QEMU guest
+Group: Applications/System
+Requires: %{name}-broker = %{version}-%{release}
+Requires: vios-proxy-guest
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
+%description vios-proxy-guest
+%{name} specific guest initialization scripts
+
%package lib
-License: GPLv2+
-Summary: C libraries used by Matahari agents
-Group: Applications/System
-Requires: %{name}-core = %{version}-%{release}
+License: GPLv2+
+Summary: C libraries used by Matahari agents
+Group: Applications/System
+Requires: %{name}-core = %{version}-%{release}
%description lib
C libraries used by Matahari agents
%package agent-lib
-License: GPLv2+
-Summary: C++ library used by Matahari agents
-Group: Applications/System
-Requires: %{name}-lib = %{version}-%{release}
-Requires: qpid-cpp-client-ssl > 0.7
-Requires(pre): shadow-utils
+License: GPLv2+
+Summary: C++ library used by Matahari agents
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: qpid-cpp-client-ssl > 0.7
+Requires(pre): shadow-utils
Requires: kstart
%description agent-lib
C++ library containing the base class for Matahari agents
%package host
-License: GPLv2+
-Summary: QMF agent for remote hosts
-Group: Applications/System
-Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name}-agent-lib = %{version}-%{release}
+License: GPLv2+
+Summary: QMF agent for remote hosts
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
%ifarch i386 x86_64
-Requires: dmidecode
+Requires: dmidecode
%endif
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(preun):initscripts
%description host
QMF agent for viewing and controlling remote hosts
%package network
-License: GPLv2+
-Summary: QMF agent for network devices
-Group: Applications/System
-Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name}-agent-lib = %{version}-%{release}
-Obsoletes: matahari-net < %{version}-%{release}
+License: GPLv2+
+Summary: QMF agent for network devices
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(preun):initscripts
+Obsoletes: matahari-net < %{version}-%{release}
%description network
QMF agent for viewing and controlling network devices
%package service
-License: GPLv2+
-Summary: QMF agent for system services
-Group: Applications/System
-Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name}-agent-lib = %{version}-%{release}
+License: GPLv2+
+Summary: QMF agent for system services
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun):initscripts
+Requires(preun):chkconfig
%description service
QMF agent for viewing and controlling system services
%package sysconfig
-License: GPLv2+
-Summary: QMF agent for post boot configuration services
-Group: Applications/System
-Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name}-agent-lib = %{version}-%{release}
-Requires: puppet
+License: GPLv2+
+Summary: QMF agent for post boot configuration services
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
+Requires: puppet
+Requires(post): chkconfig
+Requires(preun):chkconfig
+Requires(preun):initscripts
%description sysconfig
QMF agent/console for providing post boot capabilities.
%package devel
-License: GPLv2+
-Summary: Matahari development package
-Group: Development/Libraries
-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: glib2-devel
+License: GPLv2+
+Summary: Matahari development package
+Group: Development/Libraries
+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: glib2-devel
%description devel
Headers and shared libraries for developing Matahari agents.
%package consoles
-License: GPLv2+
-Summary: QMF console for monitoring various agents
-Group: Applications/System
-Requires: %{name}-lib = %{version}-%{release}
-Requires: %{name}-agent-lib = %{version}-%{release}
+License: GPLv2+
+Summary: QMF console for monitoring various agents
+Group: Applications/System
+Requires: %{name}-lib = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
%description consoles
QMF console for monitoring various agents
@@ -215,6 +258,8 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-host
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
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-vios-proxy-host
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-vios-proxy-guest
%endif
%post -n matahari-lib -p /sbin/ldconfig
@@ -231,6 +276,8 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-broker
%post host
%if %{systemd}
systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add matahari-host
%endif
/sbin/service matahari-host condrestart
@@ -252,6 +299,8 @@ fi
%post network
%if %{systemd}
systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add matahari-network
%endif
/sbin/service matahari-network condrestart
@@ -273,6 +322,8 @@ fi
%post service
%if %{systemd}
systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add matahari-service
%endif
/sbin/service matahari-service condrestart
@@ -294,6 +345,8 @@ fi
%post sysconfig
%if %{systemd}
systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add matahari-sysconfig
%endif
/sbin/service matahari-sysconfig condrestart
@@ -315,6 +368,8 @@ fi
%post broker
%if %{systemd}
systemctl --system daemon-reload
+%else
+/sbin/chkconfig --add matahari-broker
%endif
/sbin/service matahari-broker condrestart
@@ -331,6 +386,45 @@ if [ "$1" -ge "1" ]; then
/sbin/service matahari-broker condrestart >/dev/null 2>&1 || :
fi
+#== Vios Proxy Host
+%post vios-proxy-host
+%if %{systemd}
+systemctl --system daemon-reload
+%endif
+/sbin/service matahari-vios-proxy-host condrestart
+
+%preun vios-proxy-host
+if [ $1 = 0 ]; then
+ /sbin/service matahari-vios-proxy-host stop >/dev/null 2>&1 || :
+%if !%{systemd}
+ chkconfig --del matahari-vios-proxy-host
+%endif
+fi
+
+%postun vios-proxy-host
+if [ "$1" -ge "1" ]; then
+ /sbin/service matahari-vios-proxy-host condrestart >/dev/null 2>&1 || :
+fi
+
+#== Vios Proxy guest
+%post vios-proxy-guest
+%if %{systemd}
+systemctl --system daemon-reload
+%endif
+/sbin/service matahari-vios-proxy-guest condrestart
+
+%preun vios-proxy-guest
+if [ $1 = 0 ]; then
+ /sbin/service matahari-vios-proxy-guest stop >/dev/null 2>&1 || :
+%if !%{systemd}
+ chkconfig --del matahari-vios-proxy-guest
+%endif
+fi
+
+%postun vios-proxy-guest
+if [ "$1" -ge "1" ]; then
+ /sbin/service matahari-vios-proxy-guest condrestart >/dev/null 2>&1 || :
+fi
#== Core
%pre core
@@ -465,6 +559,14 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{_mandir}/man8/matahari-qmf-sysconfigd.8*
%endif
+%if %{with dbus}
+%attr(755, root, root) %{_sbindir}/matahari-dbus-sysconfigd
+%config %{_sysconfdir}/dbus-1/system.d/org.matahariproject.Sysconfig.conf
+%{_datadir}/dbus-1/interfaces/org.matahariproject.Sysconfig.xml
+%{_datadir}/dbus-1/system-services/org.matahariproject.Sysconfig.service
+%{_datadir}/polkit-1/actions/org.matahariproject.Sysconfig.policy
+%endif
+
%files consoles
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
@@ -505,14 +607,45 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%exclude %{_sysconfdir}/matahari-broker.conf
%endif
+%files vios-proxy-host
+%defattr(644, root, root, 755)
+%config(noreplace) %{_sysconfdir}/sysconfig/matahari-vios-proxy
+
+%if %{systemd}
+%{_unitdir}/matahari-vios-proxy-host.service
+%endif
+
+%if %{with qmf}
+%if !%{systemd}
+%attr(755, root, root) %{_initddir}/matahari-vios-proxy-host
+%endif
+%endif
+
+%files vios-proxy-guest
+%defattr(644, root, root, 755)
+%{_sysconfdir}/udev/rules.d/99-matahari-guest-agent.rules
+%config(noreplace) %{_sysconfdir}/sysconfig/matahari-vios-proxy
+
+%if %{systemd}
+%{_unitdir}/matahari-vios-proxy-guest.service
+%endif
+
+%if %{with qmf}
+%if !%{systemd}
+%attr(755, root, root) %{_initddir}/matahari-vios-proxy-guest
+%endif
+%endif
+
%files devel
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
%{_libdir}/libm*.so
%{_includedir}/matahari.h
+%{_includedir}/matahari/config.h
%{_includedir}/matahari/logging.h
%{_includedir}/matahari/utilities.h
+%{_includedir}/matahari/errors.h
%{_includedir}/matahari/dnssrv.h
%{_includedir}/matahari/host.h
%{_includedir}/matahari/network.h
@@ -536,6 +669,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%endif
%changelog
+* Fri Oct 21 2011 Adam Stokes <astokes at fedoraproject.org> 0.5.0
+- New upstream release
+
* Mon Sep 26 2011 Russell Bryant <rbryant at redhat.com> 0.4.7-0.2.94a4de1.git
- Only depend on dmidecode on architectures that include it (i386 and x86_64)
- Resolves: rhbz#745386
diff --git a/sources b/sources
index c2c566e..c817d38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a36260f079974f9d2c94e578f96eebee matahari-matahari-94a4de1.tgz
+322d3cfb39a73aff7cbda0fdd44287e3 matahari-0.5.0.tar.gz
More information about the scm-commits
mailing list