[matahari] New upstream release

[Adam Stokes]

commit 39712535a893f4d16a06c65eed79a5a7b7830e51
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Fri Sep 9 10:39:10 2011 -0400

     New upstream release

 .gitignore    |    1 +
 matahari.spec |   43 +++++++++++++++++++++++++++++++++++++------
 sources       |    2 +-
 3 files changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 54b7258..8030e0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ matahari-0.0.5.tar.gz
 /matahari-matahari-a9bc73a.tgz
 /matahari-matahari-cb3faf4.tgz
 /matahari-matahari-67227ab.tgz
+/matahari-matahari-2667bbb.tgz
diff --git a/matahari.spec b/matahari.spec
index 249e633..2eae7eb 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,5 +1,5 @@
-%global specversion 3
-%global upstream_version 67227ab
+%global specversion 1
+%global upstream_version 2667bbb
 
 # Messaging buses
 %bcond_without dbus
@@ -15,13 +15,13 @@
 %endif
 
 Name:		matahari
-Version:	0.4.2
+Version:	0.4.4
 Release:	%{mh_release}%{?dist}
 Summary:	Matahari QMF Agents for Linux guests
 
 Group:		Applications/System
 License:	GPLv2
-URL:		http://github.com/matahari/matahari/wiki
+URL:		http://matahariproject.org
 
 # 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
@@ -181,15 +181,25 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
+%if %{defined _unitdir}
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-service
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/matahari-network
+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
+%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
-%{__ln_s} qpidd $RPM_BUILD_ROOT/%{_sbindir}/matahari-brokerd
 
 %{__install} -d -m0770 $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
 %{__install} -d -m0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}
@@ -331,7 +341,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %endif
 
 %if %{with qmf}
+%if %{undefined _unitdir}
 %attr(755, root, root) %{_initddir}/matahari-network
+%endif
 %attr(755, root, root) %{_sbindir}/matahari-qmf-networkd
 %endif
 
@@ -351,7 +363,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %endif
 
 %if %{with qmf}
+%if %{undefined _unitdir}
 %attr(755, root, root) %{_initddir}/matahari-host
+%endif
 %attr(755, root, root) %{_sbindir}/matahari-qmf-hostd
 %endif
 
@@ -371,7 +385,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %endif
 
 %if %{with qmf}
+%if %{undefined _unitdir}
 %attr(755, root, root) %{_initddir}/matahari-service
+%endif
 %attr(755, root, root) %{_sbindir}/matahari-qmf-serviced
 %attr(755, root, root) %{_sbindir}/matahari-qmf-service-cli
 %endif
@@ -393,7 +409,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %{_unitdir}/matahari-sysconfig.service
 %endif
 %if %{with qmf}
+%if %{undefined _unitdir}
 %attr(755, root, root) %{_initddir}/matahari-sysconfig
+%endif
 %attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfigd
 %endif
 
@@ -402,20 +420,30 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %doc AUTHORS COPYING
 
 %if %{with qmf}
+%if %{undefined _unitdir}
 %attr(755, root, root) %{_initddir}/matahari-sysconfig-console
+%endif
 %attr(755, root, root) %{_sbindir}/matahari-qmf-sysconfig-consoled
+%if %{defined _unitdir}
+%{_unitdir}/matahari-sysconfig-console.service
+%endif
 %endif
 
 %if %{with qmf}
 %files broker
 %defattr(644, root, root, 755)
+%if %{undefined _unitdir}
 %attr(755, root, root) %{_initddir}/matahari-broker
+%endif
 %config(noreplace) %{_sysconfdir}/sysconfig/matahari-broker
 %config(noreplace) %{_sysconfdir}/matahari-broker.conf
-%{_sbindir}/matahari-brokerd
+%attr(755, root, root) %{_sbindir}/matahari-brokerd
 
 %doc AUTHORS COPYING
 
+%if %{defined _unitdir}
+%{_unitdir}/matahari-broker.service
+%endif
 %else
 %exclude %{_sysconfdir}/matahari-broker.conf
 %endif
@@ -451,6 +479,9 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Sep 09 2011 Adam Stokes <astokes at fedoraproject.org> 0.4.4-0.1.2667bbb.git
+- New upstream release
+
 * Mon Aug 29 2011 Adam Stokes <astokes at fedoraproject.org> 0.4.2-3.1.67227ab.git
 - Resolves: rhbz #733793 - hostd crashes on startup
 
diff --git a/sources b/sources
index e07d0fb..1854bf9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cd090bc56051535865e489fbe1e2e6e  matahari-matahari-67227ab.tgz
+eeac6e19b6fff40730e5f9479b0eb853  matahari-matahari-2667bbb.tgz