[matahari] - New upstream release

Tue Sep 20 20:35:31 UTC 2011

commit 2ac475c770f60a093a7a1a88e3b1e54f1c6d5c3f
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Tue Sep 20 16:35:10 2011 -0400

    - New upstream release

 .gitignore    |    1 +
 matahari.spec |   86 ++++++++++++++++++++++++++++++++++++++------------------
 sources       |    2 +-
 3 files changed, 60 insertions(+), 29 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3d2c4e3..92eadb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ matahari-0.0.5.tar.gz
 /matahari-matahari-67227ab.tgz
 /matahari-matahari-2667bbb.tgz
 /matahari-matahari-59d1fe1.tgz
+/matahari-matahari-f4a02ae.tgz
diff --git a/matahari.spec b/matahari.spec
index 96ab7a0..49609b5 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,5 +1,5 @@
 %global specversion 1
-%global upstream_version 59d1fe1
+%global upstream_version f4a02ae
 
 # Messaging buses
 %bcond_without dbus
@@ -15,7 +15,7 @@
 %endif
 
 Name:		matahari
-Version:	0.4.5
+Version:	0.4.7
 Release:	%{mh_release}%{?dist}
 Summary:	Matahari QMF Agents for Linux guests
 
@@ -34,6 +34,7 @@ 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}
@@ -41,11 +42,11 @@ Requires:	%{name}-network = %{version}-%{release}
 Requires:	%{name}-service = %{version}-%{release}
 Requires:	%{name}-sysconfig = %{version}-%{release}
 BuildRequires:	cmake
-BuildRequires:	libudev-devel
+BuildRequires:	libuuid-devel
 BuildRequires:	gcc-c++
 BuildRequires:	pcre-devel
 BuildRequires:	glib2-devel
-BuildRequires:	sigar-devel
+BuildRequires:	sigar-devel > 1.6.5-0.2
 BuildRequires:	libcurl-devel
 BuildRequires:	cxxtest
 BuildRequires:	help2man
@@ -71,13 +72,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.
 
+%package core
+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} = %{version}-%{release}
+Requires:	%{name}-core = %{version}-%{release}
 Requires:	qpid-cpp-server > 0.7
 Requires:	qpid-cpp-server-ssl > 0.7
 Requires:	qmf > 0.7
@@ -90,6 +98,7 @@ Optional AMQP Broker for Matahari
 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
@@ -140,7 +149,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}
@@ -192,20 +201,6 @@ 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
 %endif
 
-%{__install} -d $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/
-%{__install} matahari.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/matahari
-
-%if %{with qmf}
-%if %{undefined _unitdir}
-%{__install} -d $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
-%{__install} matahari-broker $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-broker
-%endif
-
-%{__install} matahari-broker.sysconf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/matahari-broker
-
-%{__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
 %postun -n matahari-lib -p /sbin/ldconfig
@@ -219,12 +214,17 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-broker
 #== Host
 
 %post host
+%if %{defined _unitdir}
+systemctl --system daemon-reload
+%endif
 /sbin/service matahari-host condrestart
 
 %preun host
 if [ $1 = 0 ]; then
    /sbin/service matahari-host stop >/dev/null 2>&1 || :
+%if %{undefined _unitdir}
    chkconfig --del matahari-host
+%endif
 fi
 
 %postun host
@@ -235,12 +235,17 @@ fi
 #== Network
 
 %post network
+%if %{defined _unitdir}
+systemctl --system daemon-reload
+%endif
 /sbin/service matahari-network condrestart
 
 %preun network
 if [ $1 = 0 ]; then
    /sbin/service matahari-network stop >/dev/null 2>&1 || :
+%if %{undefined _unitdir}
    chkconfig --del matahari-network
+%endif
 fi
 
 %postun network
@@ -251,12 +256,17 @@ fi
 #== Services
 
 %post service
+%if %{defined _unitdir}
+systemctl --system daemon-reload
+%endif
 /sbin/service matahari-service condrestart
 
 %preun service
 if [ $1 = 0 ]; then
    /sbin/service matahari-service stop >/dev/null 2>&1 || :
+%if %{undefined _unitdir}
    chkconfig --del matahari-service
+%endif
 fi
 
 %postun service
@@ -267,12 +277,17 @@ fi
 #== Sysconfig
 
 %post sysconfig
+%if %{defined _unitdir}
+systemctl --system daemon-reload
+%endif
 /sbin/service matahari-sysconfig condrestart
 
 %preun sysconfig
 if [ $1 = 0 ]; then
    /sbin/service matahari-sysconfig stop >/dev/null 2>&1 || :
+%if %{undefined _unitdir}
    chkconfig --del matahari-sysconfig
+%endif
 fi
 
 %postun sysconfig
@@ -283,21 +298,27 @@ fi
 #== Broker
 
 %post broker
+%if %{defined _unitdir}
+systemctl --system daemon-reload
+%endif
 /sbin/service matahari-broker condrestart
 
 %preun broker
 if [ $1 = 0 ]; then
     /sbin/service matahari-broker stop >/dev/null 2>&1 || :
+%if %{undefined _unitdir}
     chkconfig --del matahari-broker
+%endif
 fi
 
 %postun broker
 if [ "$1" -ge "1" ]; then
     /sbin/service matahari-broker condrestart >/dev/null 2>&1 || :
 fi
-#== Agent Lib
 
-%pre agent-lib
+#== Core
+
+%pre core
 getent group qpidd >/dev/null || groupadd -r qpidd
 exit 0
 
@@ -313,13 +334,10 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %files agent-lib
 %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}
@@ -334,6 +352,13 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %{_libdir}/libmservice.so.*
 %{_libdir}/libmsysconfig.so.*
 %doc AUTHORS COPYING
+%files core
+%defattr(644, root, root, 755)
+%doc AUTHORS COPYING
+%config(noreplace) %{_sysconfdir}/sysconfig/matahari
+%if %{with qmf}
+%dir %attr(0770, root, qpidd) %{_localstatedir}/lib/%{name}
+%endif
 
 %files network
 %defattr(644, root, root, 755)
@@ -352,7 +377,7 @@ 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
+%config %{_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
@@ -375,7 +400,7 @@ 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
+%config %{_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
@@ -398,7 +423,7 @@ 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
+%config %{_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
@@ -452,6 +477,8 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 
 %if %{defined _unitdir}
 %{_unitdir}/matahari-broker.service
+%else
+%ghost %dir %attr(0775, root, qpidd) %{_localstatedir}/run/%{name}
 %endif
 %else
 %exclude %{_sysconfdir}/matahari-broker.conf
@@ -488,6 +515,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Sep 20 2011 Adam Stokes <astokes at fedoraproject.org> 0.4.7-0.1.f4a02ae.git
+- New upstream release
+
 * Wed Sep 14 2011 Adam Stokes <astokes at fedoraproject.org> 0.4.5-0.1.59d1fe1.git
 - New upstream release
 
diff --git a/sources b/sources
index ccf6cb6..bd658eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a49798741b0a4323263ad55ff28da73  matahari-matahari-59d1fe1.tgz
+6854598f4f2482c460d227b6755006c0  matahari-matahari-f4a02ae.tgz
