From 82dac5a56e9354760d6ccfedec536b90596b750d Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Jul 30 2012 19:47:42 +0000
Subject: systemd updates, bump version


* on newer-than-currently-released fedora or rhel releases, install the
  systemd unit file rather than the init script
* bump to 0.31.2

---

diff --git a/configure.ac b/configure.ac
index 9a20cc0..26d8bb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(oddjob,0.31.1)
+AC_INIT(oddjob,0.31.2)
 AC_PREREQ(2.59)
 PACKAGE_NAME_CAPS=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'`
 AC_DEFINE_UNQUOTED(PACKAGE_NAME_CAPS,"$PACKAGE_NAME_CAPS",[Define to the package name, in caps.])
diff --git a/oddjob.spec b/oddjob.spec
index 72e0824..30911d9 100644
--- a/oddjob.spec
+++ b/oddjob.spec
@@ -1,8 +1,13 @@
 %global build_sample_subpackage 0
 %global dbus_send /bin/dbus-send
+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
+%global systemd 1
+%else
+%global systemd 0
+%endif
 
 Name: oddjob
-Version: 0.31.1
+Version: 0.31.2
 Release: 1%{?dist}
 Source: http://fedorahosted.org/released/oddjob/oddjob-%{version}.tar.gz
 Summary: A D-Bus service which runs odd jobs on behalf of client applications
@@ -13,6 +18,9 @@ BuildRequires: dbus-devel >= 0.22, dbus-x11, libselinux-devel, libxml2-devel
 BuildRequires: pam-devel, python-devel, pkgconfig
 BuildRequires: cyrus-sasl-devel, krb5-devel, openldap-devel
 BuildRequires: docbook-dtds, xmlto
+%if %{systemd}
+BuildRequires: systemd-units
+%endif
 Requires(post): /sbin/service
 Requires(postun): /sbin/service
 Requires(post): /sbin/chkconfig
@@ -57,6 +65,11 @@ sample_flag=--enable-sample
 	--with-selinux-labels \
 	--without-python --enable-xml-docs --enable-compat-dtd \
 	--disable-dependency-tracking \
+%if %{systemd}
+	--enable-systemd --disable-sysvinit \
+%else
+	--enable-sysvinit --disable-systemd \
+%endif
 	$sample_flag
 make %{_smp_mflags}
 
@@ -96,7 +109,11 @@ rm -fr "$RPM_BUILD_ROOT"
 %if ! %{build_sample_subpackage}
 %doc sample-install-root/sample
 %endif
+%if %{systemd}
+%{_unitdir}/oddjobd.service
+%else
 %{_initrddir}/oddjobd
+%endif
 %{_bindir}/*
 %{_sbindir}/*
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
@@ -160,6 +177,17 @@ fi
 exit 0
 
 %changelog
+* Mon Jul 30 2012 Nalin Dahyabhai <nalin@redhat.com> 0.31.2-1
+- refer to $local_fs instead of $localfs in the init script (#802719)
+- install a systemd unit file instead of an init script on still-in-development
+  releases (#820137,818963)
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.31.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Feb 15 2011 Nalin Dahyabhai <nalin@redhat.com> 0.31.1-1
 - also tell the system message bus to reload its configuration when we install
   a subpackage with a new service in it