[matahari] New upstream version
Andrew Beekhof
beekhof at fedoraproject.org
Thu Jul 21 03:56:24 UTC 2011
commit f66e05179027b9cbd85a3eb533704844b2d7bb90
Author: Andrew Beekhof <andrew at beekhof.net>
Date: Thu Jul 21 13:52:20 2011 +1000
New upstream version
.gitignore | 1 +
matahari.spec | 230 ++++++++++++++++++++++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 188 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e88d228..9d80547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
matahari-0.0.5.tar.gz
/matahari-matahari-8003b6c.tgz
/matahari-matahari-0.4.1.tgz
+/matahari-matahari-a9bc73a.tgz
diff --git a/matahari.spec b/matahari.spec
index 88ec7ea..1349b13 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,16 +1,19 @@
-%global specversion 2
-%global upstream_hash 598a300
-%global upstream_version 0.4.1
+%global specversion 1
+%global upstream_hash a9bc73a
+%global upstream_version a9bc73a
# Keep around for when/if required
-#global alphatag %{upstream_hash}.git
+#global alphatag {upstream_hash}.git
%global mh_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+%bcond_without dbus
+%bcond_without qmf
+
Name: matahari
-Version: 0.4.1
+Version: 0.4.2
Release: %{mh_release}
-Summary: Matahari QMF Agents for Linux guests
+Summary: QMF Agents for Linux guests
Group: Applications/System
License: GPLv2
@@ -18,14 +21,19 @@ URL: http://github.com/matahari/matahari/wiki
# wget --no-check-certificate -O matahari-matahari-{upstream_version}.tgz https://github.com/matahari/matahari/tarball/v{upstream_version}
Source0: matahari-matahari-%{upstream_version}.tgz
-Patch3: matahari-no-qpidd.patch
-Patch4: matahari-lsb.patch
-Patch5: matahari-qmf-lib.patch
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: %{name}-broker
+Requires: %{name}-host
+Requires: %{name}-network
+Requires: %{name}-service
+Requires: %{name}-sysconfig
+
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: dbus-devel
@@ -35,6 +43,15 @@ BuildRequires: pcre-devel
BuildRequires: glib2-devel
BuildRequires: sigar-devel
+%if %{with qmf}
+BuildRequires: qpid-cpp-client-devel > 0.7
+BuildRequires: qmf-devel > 0.7
+%endif
+
+%if %{with dbus}
+BuildRequires: dbus-devel dbus-glib-devel polkit-devel libxslt
+%endif
+
%description
Matahari provides QMF Agents that can be used to control and manage
@@ -47,17 +64,20 @@ QMF provides a modeling framework layer on top of qpid (which implements
AMQP). This interface allows you to manage a host and its various components
as a set of objects with properties and methods.
+
+%if %{with qmf}
%package broker
License: GPLv2+
Summary: Optional AMQP Broker for Matahari
Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-agent-lib = %{version}-%{release}
Requires: qpid-cpp-server > 0.7
Requires: qpid-cpp-server-ssl > 0.7
Requires: qmf > 0.7
%description broker
Optional AMQP Broker for Matahari
+%endif
%package lib
License: GPLv2+
@@ -87,14 +107,15 @@ Requires: %{name}-agent-lib = %{version}-%{release}
%description host
QMF agent for viewing and controlling remote hosts
-%package net
+%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}
-%description net
+%description network
QMF agent for viewing and controlling network devices
%package service
@@ -107,6 +128,16 @@ Requires: %{name}-agent-lib = %{version}-%{release}
%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}
+
+%description sysconfig
+QMF agent/console for providing post boot capabilities.
+
%package devel
License: GPLv2+
Summary: Matahari development package
@@ -122,32 +153,29 @@ Requires: glib2-devel
Headers and shared libraries for developing Matahari agents.
%prep
-%setup -q -n matahari-matahari-%{upstream_hash}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%setup -q -n matahari-matahari-%{upstream_version}
%build
-%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo .
+%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo %{!?with_qmf: -DWITH-QMF:BOOL=OFF} %{!?with_dbus: -DWITH-DBUS:BOOL=OFF} -Dinitdir=%{_initddir} -Dsysconfdir=%{_sysconfdir} .
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
+%{__install} -d $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/
+%{__install} matahari.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/matahari
+
+%if %{with qmf}
%{__install} -d $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
-%{__install} matahari.init $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-net
-%{__install} matahari.init $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-host
-%{__install} matahari.init $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-service
%{__install} matahari-broker $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-broker
-%{__install} -d $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/
-%{__install} matahari.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/matahari
%{__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}
+%endif
%post -n matahari-lib -p /sbin/ldconfig
%postun -n matahari-lib -p /sbin/ldconfig
@@ -157,10 +185,12 @@ make DESTDIR=%{buildroot} install
# Can't use -p, gives: '/sbin/ldconfig: relative path `0' used to build cache' error
/sbin/ldconfig
+%if %{with qmf}
#== Host
%post host
/sbin/service matahari-host condrestart
+/sbin/chkconfig --add matahari-host
%preun host
if [ $1 = 0 ]; then
@@ -175,24 +205,26 @@ fi
#== Network
-%post net
-/sbin/service matahari-net condrestart
+%post network
+/sbin/service matahari-network condrestart
+/sbin/chkconfig --add matahari-network
-%preun net
+%preun network
if [ $1 = 0 ]; then
- /sbin/service matahari-net stop >/dev/null 2>&1 || :
- chkconfig --del matahari-net
+ /sbin/service matahari-network stop >/dev/null 2>&1 || :
+ chkconfig --del matahari-network
fi
-%postun net
+%postun network
if [ "$1" -ge "1" ]; then
- /sbin/service matahari-net condrestart >/dev/null 2>&1 || :
+ /sbin/service matahari-network condrestart >/dev/null 2>&1 || :
fi
#== Services
%post service
/sbin/service matahari-service condrestart
+/sbin/chkconfig --add matahari-service
%preun service
if [ $1 = 0 ]; then
@@ -205,11 +237,34 @@ if [ "$1" -ge "1" ]; then
/sbin/service matahari-service condrestart >/dev/null 2>&1 || :
fi
+#== Sysconfig
+
+%post sysconfig
+/sbin/service matahari-postboot condrestart
+/sbin/chkconfig --add matahari-postboot
+
+/sbin/service matahari-postboot-console condrestart
+#/sbin/chkconfig --add matahari-postboot-console
+
+%preun sysconfig
+if [ $1 = 0 ]; then
+ /sbin/service matahari-postboot-console stop >/dev/null 2>&1 || :
+ /sbin/service matahari-postboot stop >/dev/null 2>&1 || :
+ chkconfig --del matahari-postboot-console
+ chkconfig --del matahari-postboot
+fi
+
+%postun sysconfig
+if [ "$1" -ge "1" ]; then
+ /sbin/service matahari-postboot-console condrestart >/dev/null 2>&1 || :
+ /sbin/service matahari-postboot condrestart >/dev/null 2>&1 || :
+fi
+
#== Broker
%post broker
/sbin/service matahari-broker condrestart
-
+/sbin/chkconfig --add matahari-broker
%preun broker
if [ $1 = 0 ]; then
@@ -222,6 +277,8 @@ if [ "$1" -ge "1" ]; then
/sbin/service matahari-broker condrestart >/dev/null 2>&1 || :
fi
+%endif
+
%clean
test "x%{buildroot}" != "x" && rm -rf %{buildroot}
@@ -231,37 +288,91 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%files agent-lib
%defattr(644, root, root, 755)
-%{_libdir}/libmqmfagent.so.*
%dir %{_datadir}/matahari/
%config(noreplace) %{_sysconfdir}/sysconfig/matahari
%doc AUTHORS COPYING
+%if %{with qmf}
+%{_libdir}/libmcommon_qmf.so.*
+%endif
+
+%if %{with dbus}
+%{_libdir}/libmcommon_dbus.so.*
+%endif
+
%files lib
%defattr(644, root, root, 755)
%{_libdir}/libmcommon.so.*
%{_libdir}/libmhost.so.*
-%{_libdir}/libmnet.so.*
-%{_libdir}/libmsrv.so.*
+%{_libdir}/libmnetwork.so.*
+%{_libdir}/libmservice.so.*
+%{_libdir}/libmpostboot.so.*
%doc AUTHORS COPYING
-%files net
+%files network
%defattr(644, root, root, 755)
-%attr(755, root, root) %{_initddir}/matahari-net
-%attr(755, root, root) %{_sbindir}/matahari-netd
%doc AUTHORS COPYING
+%if %{with qmf}
+%attr(755, root, root) %{_initddir}/matahari-network
+%attr(755, root, root) %{_sbindir}/matahari-qmf-networkd
+%endif
+
+%if %{with dbus}
+%attr(755, root, root) %{_sbindir}/matahari-dbus-networkd
+%{_datadir}/polkit-1/actions/org.matahariproject.Network.policy
+%{_datadir}/dbus-1/interfaces/org.matahariproject.Network.xml
+%{_datadir}/dbus-1/system-services/org.matahariproject.Network.service
+%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Network.conf
+%endif
+
%files host
%defattr(644, root, root, 755)
-%attr(755, root, root) %{_initddir}/matahari-host
-%attr(755, root, root) %{_sbindir}/matahari-hostd
%doc AUTHORS COPYING
+%if %{with qmf}
+%attr(755, root, root) %{_initddir}/matahari-host
+%attr(755, root, root) %{_sbindir}/matahari-qmf-hostd
+%endif
+
+%if %{with dbus}
+%attr(755, root, root) %{_sbindir}/matahari-dbus-hostd
+%{_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
+%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Host.conf
+%endif
+
%files service
%defattr(644, root, root, 755)
+%doc AUTHORS COPYING
+
+%if %{with qmf}
%attr(755, root, root) %{_initddir}/matahari-service
-%attr(755, root, root) %{_sbindir}/matahari-serviced
+%attr(755, root, root) %{_sbindir}/matahari-qmf-serviced
+%attr(755, root, root) %{_sbindir}/matahari-qmf-service-cli
+%endif
+
+%if %{with dbus}
+%attr(755, root, root) %{_sbindir}/matahari-dbus-serviced
+%{_datadir}/polkit-1/actions/org.matahariproject.Services.policy
+%{_datadir}/dbus-1/interfaces/org.matahariproject.Services.xml
+%{_datadir}/dbus-1/system-services/org.matahariproject.Services.service
+%{_sysconfdir}/dbus-1/system.d/org.matahariproject.Services.conf
+%endif
+
+%files sysconfig
+%defattr(644, root, root, 755)
%doc AUTHORS COPYING
+%if %{with qmf}
+%attr(755, root, root) %{_initddir}/matahari-postboot
+%attr(755, root, root) %{_initddir}/matahari-postboot-console
+%attr(755, root, root) %{_sbindir}/matahari-qmf-postbootd
+%attr(755, root, root) %{_sbindir}/matahari-qmf-postboot-consoled
+%endif
+
+%if %{with qmf}
%files broker
%defattr(644, root, root, 755)
%attr(755, root, root) %{_initddir}/matahari-broker
@@ -269,18 +380,49 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/matahari-broker.conf
%{_sbindir}/matahari-brokerd
-%attr(755, qpidd, qpidd) %{_localstatedir}/lib/%{name}
-%attr(755, qpidd, qpidd) %{_localstatedir}/run/%{name}
+%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
+
%files devel
%defattr(644, root, root, 755)
-%{_datadir}/matahari/schema.xml
-%{_includedir}/matahari.h
-%{_libdir}/libm*.so
%doc AUTHORS COPYING
+%{_libdir}/libm*.so
+%{_includedir}/matahari.h
+%{_includedir}/matahari/logging.h
+%{_includedir}/matahari/utilities.h
+%{_includedir}/matahari/dnssrv.h
+%{_includedir}/matahari/host.h
+%{_includedir}/matahari/network.h
+%{_includedir}/matahari/postboot.h
+%{_includedir}/matahari/services.h
+%{_datadir}/cmake/Modules/FindMatahari.cmake
+
+%if %{with qmf}
+%{_includedir}/matahari/agent.h
+%{_includedir}/matahari/mainloop.h
+%{_datadir}/cmake/Modules/FindQPID.cmake
+%endif
+
+%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
+%endif
+
%changelog
+* Thu Jul 21 2011 Andrew Beekhof <andrew at beekhof.net> 0.4.2-1
+- New upstream relase
+- Add dbus support
+- Make dbus/qmf support optional at build time
+
* Tue May 3 2011 Andrew Beekhof <andrew at beekhof.net> 0.4.1-2
- Rebuild for new qpid-cpp
diff --git a/sources b/sources
index f02c5a8..3ef4818 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b5050df26180e4282cbbf7bbb1bab97 matahari-matahari-0.4.1.tgz
+16f3ec8f65b58c9f2834a794c47b219b matahari-matahari-a9bc73a.tgz
More information about the scm-commits
mailing list