[oddjob] update to 0.31.2
Nalin Dahyabhai
nalin at fedoraproject.org
Wed Aug 29 19:43:09 UTC 2012
commit ec88839c916789826bf95fe60fec7eb1af9f50e5
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date: Wed Aug 29 15:42:38 2012 -0400
update to 0.31.2
- 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)
- build binaries position-independent and marked for earliest-possible symbol
resolution (#852800)
- don't worry about moving things from /usr to / when they're the same (#852800)
.gitignore | 2 +
oddjob.spec | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
sources | 3 +-
3 files changed, 64 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbe2ee4..2081e58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ oddjob-0.30.tar.gz
oddjob-0.30.1.tar.gz
/oddjob-0.31.tar.gz
/oddjob-0.31.1.tar.gz
+/oddjob-0.31.2.tar.gz
+/oddjob-0.31.2.tar.gz.sig
diff --git a/oddjob.spec b/oddjob.spec
index 68df776..ac15643 100644
--- a/oddjob.spec
+++ b/oddjob.spec
@@ -1,9 +1,19 @@
%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
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+%global separate_usr 0
+%else
+%global separate_usr 1
+%endif
Name: oddjob
-Version: 0.31.1
-Release: 3%{?dist}
+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
License: BSD
@@ -13,10 +23,18 @@ 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
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+Requires(post): systemd-sysv
+%else
Requires(post): /sbin/service
Requires(postun): /sbin/service
Requires(post): /sbin/chkconfig
Requires(pre): /sbin/chkconfig
+%endif
Obsoletes: oddjob-devel < 0.30, oddjob-libs < 0.30, oddjob-python < 0.30
URL: http://www.fedorahosted.org/oddjob
@@ -53,10 +71,16 @@ sample_flag=--enable-sample
%endif
%configure \
--disable-static \
+ --enable-pie --enable-now \
--with-selinux-acls \
--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}
@@ -65,10 +89,12 @@ rm -fr "$RPM_BUILD_ROOT"
make install DESTDIR="$RPM_BUILD_ROOT"
rm -f "$RPM_BUILD_ROOT"/%{_libdir}/security/*.la
rm -f "$RPM_BUILD_ROOT"/%{_libdir}/security/*.a
+%if %{separate_usr}
if ! test -d "$RPM_BUILD_ROOT"/%{_lib}/security ; then
mkdir -p "$RPM_BUILD_ROOT"/%{_lib}/security
mv "$RPM_BUILD_ROOT"/%{_libdir}/security/*.so "$RPM_BUILD_ROOT"/%{_lib}/security/
fi
+%endif
# Recommended, though I disagree.
rm -f "$RPM_BUILD_ROOT"/%{_libdir}/*.la
@@ -96,7 +122,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
@@ -113,7 +143,11 @@ rm -fr "$RPM_BUILD_ROOT"
%doc src/mkhomedirfor src/mkmyhomedir
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/mkhomedir
+%if %{separate_usr}
/%{_lib}/security/pam_oddjob_mkhomedir.so
+%else
+%{_libdir}/security/pam_oddjob_mkhomedir.so
+%endif
%{_mandir}/*/pam_oddjob_mkhomedir.*
%config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob-mkhomedir.conf
%config(noreplace) %{_sysconfdir}/oddjobd.conf.d/oddjobd-mkhomedir.conf
@@ -130,18 +164,34 @@ rm -fr "$RPM_BUILD_ROOT"
if test $1 -eq 1 ; then
killall -HUP dbus-daemon 2>&1 > /dev/null
fi
+%if %{systemd}
+if test $1 -eq 1 ; then
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%else
/sbin/chkconfig --add oddjobd
+%endif
%postun
if [ $1 -gt 0 ] ; then
+%if %{systemd}
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /bin/systemctl try-restart oddjobd.service >/dev/null 2>&1 || :
+%else
/sbin/service oddjobd condrestart 2>&1 > /dev/null || :
+%endif
fi
exit 0
%preun
if [ $1 -eq 0 ] ; then
+%if %{systemd}
+ /bin/systemctl --no-reload disable oddjob.service > /dev/null 2>&1 || :
+ /bin/systemctl stop oddjob.service > /dev/null 2>&1 || :
+%else
/sbin/service oddjobd stop > /dev/null 2>&1
/sbin/chkconfig --del oddjobd
+%endif
fi
%post mkhomedir
@@ -160,6 +210,14 @@ fi
exit 0
%changelog
+* Wed Aug 29 2012 Nalin Dahyabhai <nalin at 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)
+- build binaries position-independent and marked for earliest-possible symbol
+ resolution (#852800)
+- don't worry about moving things from /usr to / when they're the same (#852800)
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 948393a..106d758 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-d25fa874ebc0908cdf0db6a60434372d oddjob-0.31.1.tar.gz
+41b5fa6cd0220371a63f212b04d1ca92 oddjob-0.31.2.tar.gz
+bd3ae9a5007f0c9141b49c116b88b6cd oddjob-0.31.2.tar.gz.sig
More information about the scm-commits
mailing list