[matahari] New upstream release
Adam Stokes
astokes at fedoraproject.org
Fri Jul 29 16:09:16 UTC 2011
commit 44f34c798990a783fd502c1dba53de18a8caf29d
Author: Adam Stokes <astokes at fedoraproject.org>
Date: Fri Jul 29 12:08:51 2011 -0400
New upstream release
Signed-off-by: Adam Stokes <astokes at fedoraproject.org>
.gitignore | 1 +
matahari.spec | 120 +++++++++++++++++++++++++++++++++------------------------
sources | 2 +-
3 files changed, 72 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d80547..61770f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ matahari-0.0.5.tar.gz
/matahari-matahari-8003b6c.tgz
/matahari-matahari-0.4.1.tgz
/matahari-matahari-a9bc73a.tgz
+/matahari-matahari-cb3faf4.tgz
diff --git a/matahari.spec b/matahari.spec
index 1349b13..745acf5 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,19 +1,21 @@
-%global specversion 1
-%global upstream_hash a9bc73a
-%global upstream_version a9bc73a
+%global specversion 2
+%global upstream_version cb3faf4
# Keep around for when/if required
-#global alphatag {upstream_hash}.git
+#%global alphatag %{upstream_version}.git
%global mh_release %{?alphatag:0.}%{specversion}%{?alphatag:.%{alphatag}}%{?dist}
+# Messaging buses
%bcond_without dbus
%bcond_without qmf
+# Systemd init scripts
+%bcond_without systemd
Name: matahari
Version: 0.4.2
Release: %{mh_release}
-Summary: QMF Agents for Linux guests
+Summary: Matahari QMF Agents for Linux guests
Group: Applications/System
License: GPLv2
@@ -28,20 +30,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dbus
Requires: qmf > 0.7
-Requires: %{name}-broker
-Requires: %{name}-host
-Requires: %{name}-network
-Requires: %{name}-service
-Requires: %{name}-sysconfig
+Requires: pcre
BuildRequires: cmake
+BuildRequires: libudev-devel
BuildRequires: gcc-c++
-BuildRequires: dbus-devel
-BuildRequires: qpid-cpp-client-devel > 0.7
-BuildRequires: qmf-devel > 0.7
BuildRequires: pcre-devel
BuildRequires: glib2-devel
BuildRequires: sigar-devel
+BuildRequires: libcurl-devel
+BuildRequires: cxxtest
+
+%if %{with systemd}
+BuildRequires: systemd-units
+%endif
%if %{with qmf}
BuildRequires: qpid-cpp-client-devel > 0.7
@@ -70,7 +72,7 @@ as a set of objects with properties and methods.
License: GPLv2+
Summary: Optional AMQP Broker for Matahari
Group: Applications/System
-Requires: %{name}-agent-lib = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: qpid-cpp-server > 0.7
Requires: qpid-cpp-server-ssl > 0.7
Requires: qmf > 0.7
@@ -96,6 +98,15 @@ Requires: qpid-cpp-client-ssl > 0.7
%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+
@@ -109,14 +120,14 @@ QMF agent for viewing and controlling remote hosts
%package network
License: GPLv2+
-Summary: QMF agent for network devices
+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 network
-QMF agent for viewing and controlling network devices
+QMF agent for viewing and controlling network devices
%package service
License: GPLv2+
@@ -130,7 +141,7 @@ QMF agent for viewing and controlling system services
%package sysconfig
License: GPLv2+
-Summary: QMF agent for post boot configuration services
+Summary: QMF agent for post boot configuration services.
Group: Applications/System
Requires: %{name}-lib = %{version}-%{release}
Requires: %{name}-agent-lib = %{version}-%{release}
@@ -190,7 +201,6 @@ make DESTDIR=%{buildroot} install
%post host
/sbin/service matahari-host condrestart
-/sbin/chkconfig --add matahari-host
%preun host
if [ $1 = 0 ]; then
@@ -207,7 +217,6 @@ fi
%post network
/sbin/service matahari-network condrestart
-/sbin/chkconfig --add matahari-network
%preun network
if [ $1 = 0 ]; then
@@ -224,7 +233,6 @@ fi
%post service
/sbin/service matahari-service condrestart
-/sbin/chkconfig --add matahari-service
%preun service
if [ $1 = 0 ]; then
@@ -240,31 +248,27 @@ 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
+/sbin/service matahari-sysconfig condrestart
+/sbin/service matahari-sysconfig-console condrestart
%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
+ /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-postboot-console condrestart >/dev/null 2>&1 || :
- /sbin/service matahari-postboot condrestart >/dev/null 2>&1 || :
+ /sbin/service matahari-sysconfig-console condrestart >/dev/null 2>&1 || :
+ /sbin/service matahari-sysconfig 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
@@ -306,12 +310,15 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{_libdir}/libmhost.so.*
%{_libdir}/libmnetwork.so.*
%{_libdir}/libmservice.so.*
-%{_libdir}/libmpostboot.so.*
+%{_libdir}/libmsysconfig.so.*
%doc AUTHORS COPYING
%files network
%defattr(644, root, root, 755)
%doc AUTHORS COPYING
+%if %{with systemd}
+%{_unitdir}/matahari-network.service
+%endif
%if %{with qmf}
%attr(755, root, root) %{_initddir}/matahari-network
@@ -320,15 +327,14 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%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)
%doc AUTHORS COPYING
+%if %{with systemd}
+%{_unitdir}/matahari-host.service
+%endif
%if %{with qmf}
%attr(755, root, root) %{_initddir}/matahari-host
@@ -337,15 +343,14 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%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 systemd}
+%{_unitdir}/matahari-service.service
+%endif
%if %{with qmf}
%attr(755, root, root) %{_initddir}/matahari-service
@@ -355,10 +360,6 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%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
@@ -366,10 +367,10 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%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
+%attr(755, root, root) %{_initddir}/matahari-sysconfig
+%attr(755, root, root) %{_initddir}/matahari-sysconfig-console
+%attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfigd
+%attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfig-consoled
%endif
%if %{with qmf}
@@ -388,6 +389,22 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%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
@@ -399,7 +416,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%{_includedir}/matahari/dnssrv.h
%{_includedir}/matahari/host.h
%{_includedir}/matahari/network.h
-%{_includedir}/matahari/postboot.h
+%{_includedir}/matahari/sysconfig.h
%{_includedir}/matahari/services.h
%{_datadir}/cmake/Modules/FindMatahari.cmake
@@ -418,6 +435,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%endif
%changelog
+* Fri Jul 29 2011 Adam Stokes <astokes at fedoraproject.org> 0.4.2-2
+- New upstream release
+
* Thu Jul 21 2011 Andrew Beekhof <andrew at beekhof.net> 0.4.2-1
- New upstream relase
- Add dbus support
diff --git a/sources b/sources
index 3ef4818..677e8fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16f3ec8f65b58c9f2834a794c47b219b matahari-matahari-a9bc73a.tgz
+9dd60997cb568ae7f2d5811f23a091cc matahari-matahari-cb3faf4.tgz
More information about the scm-commits
mailing list