[matahari] resolves rhbz 733793
Adam Stokes
astokes at fedoraproject.org
Mon Aug 29 15:38:12 UTC 2011
commit 8751037df2e8d1fec09e390587647ec51ce5fbec
Author: Adam Stokes <astokes at fedoraproject.org>
Date: Mon Aug 29 11:35:30 2011 -0400
resolves rhbz 733793
.gitignore | 1 +
matahari.spec | 128 ++++++++++++++++++++++++++++++++------------------------
sources | 2 +-
3 files changed, 75 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61770f8..54b7258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ matahari-0.0.5.tar.gz
/matahari-matahari-0.4.1.tgz
/matahari-matahari-a9bc73a.tgz
/matahari-matahari-cb3faf4.tgz
+/matahari-matahari-67227ab.tgz
diff --git a/matahari.spec b/matahari.spec
index b942df6..249e633 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,21 +1,22 @@
-%global specversion 1
-%global upstream_version cb3faf4
-
-# Keep around for when/if required
-%global alphatag %{upstream_version}.git
-
-%global mh_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+%global specversion 3
+%global upstream_version 67227ab
# Messaging buses
%bcond_without dbus
%bcond_without qmf
-# Systemd init scripts
-%bcond_without systemd
+# Choose a versioning scheme
+%bcond_without pre_release
+
+%if %{with pre_release}
+%global mh_release 0.%{specversion}.%{upstream_version}.git
+%else
+%global mh_release %{specversion}
+%endif
Name: matahari
Version: 0.4.2
-Release: %{mh_release}
+Release: %{mh_release}%{?dist}
Summary: Matahari QMF Agents for Linux guests
Group: Applications/System
@@ -33,6 +34,12 @@ Requires: qmf > 0.7
Requires: pcre
+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: libudev-devel
BuildRequires: gcc-c++
@@ -40,11 +47,7 @@ BuildRequires: pcre-devel
BuildRequires: glib2-devel
BuildRequires: sigar-devel
BuildRequires: libcurl-devel
-BuildRequires: cxxtest
-
-%if %{with systemd}
-BuildRequires: systemd-units
-%endif
+BuildRequires: cxxtest
%if %{with qmf}
BuildRequires: qpid-cpp-client-devel > 0.7
@@ -96,18 +99,10 @@ 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
%description agent-lib
C++ library containing the base class for Matahari agents
-%if %{with dbus}
-%package dbus
-License: GPLv2+
-Summary: DBus policies for Matahari services
-Group: Applications/System
-
-%description dbus
-DBus policies for allowing Matahari to be used on the local system
-%endif
%package host
License: GPLv2+
@@ -115,6 +110,7 @@ Summary: QMF agent for remote hosts
Group: Applications/System
Requires: %{name}-lib = %{version}-%{release}
Requires: %{name}-agent-lib = %{version}-%{release}
+Requires: dmidecode
%description host
QMF agent for viewing and controlling remote hosts
@@ -146,6 +142,7 @@ Summary: QMF agent for post boot configuration services.
Group: Applications/System
Requires: %{name}-lib = %{version}-%{release}
Requires: %{name}-agent-lib = %{version}-%{release}
+Requires: puppet >= 2.6.6
%description sysconfig
QMF agent/console for providing post boot capabilities.
@@ -164,6 +161,15 @@ 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}
+
+%description consoles
+QMF console for monitoring various agents
%prep
%setup -q -n matahari-matahari-%{upstream_version}
@@ -185,8 +191,8 @@ make DESTDIR=%{buildroot} install
%{__install} matahari-broker.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/matahari-broker
%{__ln_s} qpidd $RPM_BUILD_ROOT/%{_sbindir}/matahari-brokerd
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name}
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/%{name}
+%{__install} -d -m0770 $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
+%{__install} -d -m0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}
%endif
%post -n matahari-lib -p /sbin/ldconfig
@@ -250,19 +256,15 @@ fi
%post sysconfig
/sbin/service matahari-sysconfig condrestart
-/sbin/service matahari-sysconfig-console condrestart
%preun sysconfig
if [ $1 = 0 ]; then
- /sbin/service matahari-sysconfig-console stop >/dev/null 2>&1 || :
/sbin/service matahari-sysconfig stop >/dev/null 2>&1 || :
- chkconfig --del matahari-sysconfig-console
chkconfig --del matahari-sysconfig
fi
%postun sysconfig
if [ "$1" -ge "1" ]; then
- /sbin/service matahari-sysconfig-console condrestart >/dev/null 2>&1 || :
/sbin/service matahari-sysconfig condrestart >/dev/null 2>&1 || :
fi
@@ -281,6 +283,11 @@ fi
if [ "$1" -ge "1" ]; then
/sbin/service matahari-broker condrestart >/dev/null 2>&1 || :
fi
+#== Agent Lib
+
+%pre agent-lib
+getent group qpidd >/dev/null || groupadd -r qpidd
+exit 0
%endif
@@ -292,13 +299,15 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%doc AUTHORS COPYING
%files agent-lib
-%defattr(644, root, root, 755)
-%dir %{_datadir}/matahari/
+%defattr(644, root, root)
+%attr(755, -, -) %dir %{_datadir}/matahari/
%config(noreplace) %{_sysconfdir}/sysconfig/matahari
%doc AUTHORS COPYING
%if %{with qmf}
%{_libdir}/libmcommon_qmf.so.*
+%dir %attr(0770, root, qpidd) %{_localstatedir}/lib/%{name}
+%ghost %dir %attr(0775, root, qpidd) %{_localstatedir}/run/%{name}
%endif
%if %{with dbus}
@@ -317,7 +326,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%files network
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
-%if %{with systemd}
+%if %{defined _unitdir}
%{_unitdir}/matahari-network.service
%endif
@@ -328,12 +337,16 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%if %{with dbus}
%attr(755, root, root) %{_sbindir}/matahari-dbus-networkd
+%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Network.conf
+%{_datadir}/dbus-1/interfaces/org.matahariproject.Network.xml
+%{_datadir}/dbus-1/system-services/org.matahariproject.Network.service
+%{_datadir}/polkit-1/actions/org.matahariproject.Network.policy
%endif
%files host
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
-%if %{with systemd}
+%if %{defined _unitdir}
%{_unitdir}/matahari-host.service
%endif
@@ -344,12 +357,16 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%if %{with dbus}
%attr(755, root, root) %{_sbindir}/matahari-dbus-hostd
+%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Host.conf
+%{_datadir}/polkit-1/actions/org.matahariproject.Host.policy
+%{_datadir}/dbus-1/interfaces/org.matahariproject.Host.xml
+%{_datadir}/dbus-1/system-services/org.matahariproject.Host.service
%endif
%files service
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
-%if %{with systemd}
+%if %{defined _unitdir}
%{_unitdir}/matahari-service.service
%endif
@@ -361,16 +378,31 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%if %{with dbus}
%attr(755, root, root) %{_sbindir}/matahari-dbus-serviced
+%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Services.conf
+%{_datadir}/dbus-1/interfaces/org.matahariproject.Services.xml
+%{_datadir}/dbus-1/system-services/org.matahariproject.Services.service
+%{_datadir}/polkit-1/actions/org.matahariproject.Services.policy
+%{_datadir}/polkit-1/actions/org.matahariproject.Resources.policy
%endif
%files sysconfig
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
+%if %{defined _unitdir}
+%{_unitdir}/matahari-sysconfig.service
+%endif
%if %{with qmf}
%attr(755, root, root) %{_initddir}/matahari-sysconfig
-%attr(755, root, root) %{_initddir}/matahari-sysconfig-console
%attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfigd
+%endif
+
+%files consoles
+%defattr(644, root, root, 755)
+%doc AUTHORS COPYING
+
+%if %{with qmf}
+%attr(755, root, root) %{_initddir}/matahari-sysconfig-console
%attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfig-consoled
%endif
@@ -382,30 +414,12 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/matahari-broker.conf
%{_sbindir}/matahari-brokerd
-%ghost %attr(755, qpidd, qpidd) %{_localstatedir}/lib/%{name}
-%ghost %attr(755, qpidd, qpidd) %{_localstatedir}/run/%{name}
%doc AUTHORS COPYING
%else
%exclude %{_sysconfdir}/matahari-broker.conf
%endif
-%if %{with dbus}
-%files dbus
-%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Host.conf
-%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Network.conf
-%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Services.conf
-%{_datadir}/dbus-1/interfaces/org.matahariproject.Host.xml
-%{_datadir}/dbus-1/interfaces/org.matahariproject.Network.xml
-%{_datadir}/dbus-1/interfaces/org.matahariproject.Services.xml
-%{_datadir}/dbus-1/system-services/org.matahariproject.Host.service
-%{_datadir}/dbus-1/system-services/org.matahariproject.Network.service
-%{_datadir}/dbus-1/system-services/org.matahariproject.Services.service
-%{_datadir}/polkit-1/actions/org.matahariproject.Host.policy
-%{_datadir}/polkit-1/actions/org.matahariproject.Network.policy
-%{_datadir}/polkit-1/actions/org.matahariproject.Services.policy
-%endif
-
%files devel
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
@@ -420,6 +434,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{_includedir}/matahari/sysconfig.h
%{_includedir}/matahari/services.h
%{_datadir}/cmake/Modules/FindMatahari.cmake
+%{_datadir}/cmake/Modules/MatahariMacros.cmake
%if %{with qmf}
%{_includedir}/matahari/agent.h
@@ -430,12 +445,15 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%if %{with dbus}
%{_includedir}/matahari/dbus_common.h
%{_includedir}/matahari/gobject_class.h
-%{_datadir}/cmake/Modules/MatahariMacros.cmake
%{_datadir}/matahari/schema-to-dbus.xsl
%{_datadir}/matahari/dbus-to-c.xsl
+%{_datadir}/matahari/check-policy.xsl
%endif
%changelog
+* Mon Aug 29 2011 Adam Stokes <astokes at fedoraproject.org> 0.4.2-3.1.67227ab.git
+- Resolves: rhbz #733793 - hostd crashes on startup
+
* Fri Jul 29 2011 Adam Stokes <astokes at fedoraproject.org> 0.4.2-2
- New upstream release
diff --git a/sources b/sources
index 677e8fc..e07d0fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dd60997cb568ae7f2d5811f23a091cc matahari-matahari-cb3faf4.tgz
+7cd090bc56051535865e489fbe1e2e6e matahari-matahari-67227ab.tgz
More information about the scm-commits
mailing list