From e199d1ca6ab8f60457b21ff78244af1fffcb205e Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Jan 29 2010 19:42:56 +0000 Subject: - resync with the devel branch to pick up the 0.30 release --- diff --git a/oddjob-0.29.1-usage.patch b/oddjob-0.29.1-usage.patch deleted file mode 100644 index e33d38f..0000000 --- a/oddjob-0.29.1-usage.patch +++ /dev/null @@ -1,14 +0,0 @@ -Advertise a couple of the commands which are already implemented. The specific -order matches one of the translated strings provided by the initscripts package. -diff -up oddjob-0.29.1-1/scripts/oddjobd.in oddjob-0.29.1-1/scripts/oddjobd.in ---- oddjob-0.29.1-1/scripts/oddjobd.in 2010-01-25 18:34:39.000000000 -0500 -+++ oddjob-0.29.1-1/scripts/oddjobd.in 2010-01-25 18:34:43.000000000 -0500 -@@ -99,7 +99,7 @@ case "$1" in - RETVAL=$? - ;; - *) -- echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" -+ echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}" - exit 1 - esac - diff --git a/oddjob.spec b/oddjob.spec index 3e222c2..4e302bd 100644 --- a/oddjob.spec +++ b/oddjob.spec @@ -1,11 +1,11 @@ -%define build_sample 0 -%define dbus_send /bin/dbus-send +%global build_sample_subpackage 0 +%global dbus_send /bin/dbus-send Name: oddjob -Version: 0.29.1 -Release: 5%{?dist} -Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz -Summary: A D-BUS service which runs odd jobs on behalf of client applications +Version: 0.30 +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 Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -17,8 +17,8 @@ Requires(post): /sbin/service Requires(postun): /sbin/service Requires(post): /sbin/chkconfig Requires(pre): /sbin/chkconfig -Patch0: oddjob-0.29.1-usage.patch -URL: http://people.redhat.com/nalin/oddjob/ +Obsoletes: oddjob-devel < 0.30, oddjob-libs < 0.30, oddjob-python < 0.30 +URL: http://www.fedorahosted.org/oddjob %description oddjob is a D-BUS service which performs particular tasks for clients which @@ -28,43 +28,13 @@ connect to it and issue requests using the system-wide message bus. Group: System Environment/Daemons Summary: An oddjob helper which creates and populates home directories Requires: %{name} = %{version}-%{release} -Requires(post): %{dbus_send} +Requires(post): %{dbus_send}, grep, sed %description mkhomedir This package contains the oddjob helper which can be used by the pam_oddjob_mkhomedir module to create a home directory for a user at login-time. -%package devel -Group: Development/Libraries -Summary: Files for developing oddjob clients -Requires: %{name}-libs = %{version}-%{release} -Requires: pkgconfig - -%description devel -This package contains header files and static libraries which aid in the -development of simple oddjob client applications. More complex clients -can of course use D-BUS APIs directly. - -%package libs -Group: System Environment/Libraries -Summary: Libraries used by oddjob clients -Requires: %{name} = %{version}-%{release} - -%description libs -This package contains dynamic libraries which are used by simple oddjob client -applications. - -%package python -Group: System Environment/Libraries -Summary: A Python binding for oddjob clients -Requires: %{name}-libs = %{version}-%{release} - -%description python -This package contains a python module which allows client applications -written in the Python language to issue requests to the oddjobd server -using the message bus. - %package sample Group: System Environment/Daemons Summary: A sample oddjob service. @@ -74,26 +44,24 @@ Requires: %{name} = %{version}-%{release} This package contains a trivial sample oddjob service. %prep -%setup -q -n %{name}-%{version}-1 -%patch0 -p1 -b .usage +%setup -q %build sample_flag= -%if %{build_sample} +%if %{build_sample_subpackage} sample_flag=--enable-sample %endif %configure \ --disable-static \ --with-selinux-acls \ --with-selinux-labels \ - --with-python --enable-xml-docs --enable-compat-dtd \ - --libexecdir=%{_libexecdir} \ + --without-python --enable-xml-docs --enable-compat-dtd \ --disable-dependency-tracking \ $sample_flag make %{_smp_mflags} %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr "$RPM_BUILD_ROOT" +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 @@ -103,23 +71,29 @@ if ! test -d "$RPM_BUILD_ROOT"/%{_lib}/security ; then fi # Recommended, though I disagree. rm -f "$RPM_BUILD_ROOT"/%{_libdir}/*.la -rm -f "$RPM_BUILD_ROOT"/%{_libdir}/python*/site-packages/*.la -%if ! %{build_sample} +%if ! %{build_sample_subpackage} # Go ahead and build the sample layout. mkdir -p sample-install-root/sample/{%{_sysconfdir}/{dbus-1/system.d,%{name}d.conf.d},%{_libdir}/%{name}} -install -m644 sample/oddjobd-sample.conf sample-install-root/sample/%{_sysconfdir}/%{name}d.conf.d/ -install -m644 sample/oddjob-sample.conf sample-install-root/sample/%{_sysconfdir}/dbus-1/system.d/ -install -m755 sample/oddjob-sample.sh sample-install-root/sample/%{_libdir}/%{name}/ +install -m644 sample/oddjobd-sample.conf sample-install-root/sample/%{_sysconfdir}/%{name}d.conf.d/ +install -m644 sample/oddjob-sample.conf sample-install-root/sample/%{_sysconfdir}/dbus-1/system.d/ +install -m755 sample/oddjob-sample.sh sample-install-root/sample/%{_libdir}/%{name}/ %endif +# Make sure we don't needlessly make these docs executable. +chmod -x src/reload src/mkhomedirfor src/mkmyhomedir + +# Make sure the datestamps match in multilib pairs. +touch -r src/oddjobd-mkhomedir.conf.in $RPM_BUILD_ROOT/%{_sysconfdir}/oddjobd.conf.d/oddjobd-mkhomedir.conf +touch -r src/oddjob-mkhomedir.conf.in $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/oddjob-mkhomedir.conf + %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr "$RPM_BUILD_ROOT" +rm -fr "$RPM_BUILD_ROOT" %files -%defattr(-,root,root) -%doc *.dtd COPYING QUICKSTART python/sample.py doc/oddjob.html src/reload -%if ! %{build_sample} +%defattr(-,root,root,-) +%doc *.dtd COPYING NEWS QUICKSTART doc/oddjob.html src/reload +%if ! %{build_sample_subpackage} %doc sample-install-root/sample %endif %{_initrddir}/oddjobd @@ -130,7 +104,6 @@ install -m755 sample/oddjob-sample.sh sample-install-root/sample/%{_libdir}/% %dir %{_sysconfdir}/oddjobd.conf.d %config(noreplace) %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf %dir %{_sysconfdir}/%{name} -%dir %{_libdir}/%{name} %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/sanity.sh %{_mandir}/*/oddjob*.* @@ -138,28 +111,14 @@ install -m755 sample/oddjob-sample.sh sample-install-root/sample/%{_libdir}/% %files mkhomedir %defattr(-,root,root) %doc src/mkhomedirfor src/mkmyhomedir -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/mkhomedir +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/mkhomedir /%{_lib}/security/pam_oddjob_mkhomedir.so %{_mandir}/*/pam_oddjob_mkhomedir.* %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob-mkhomedir.conf %config(noreplace) %{_sysconfdir}/oddjobd.conf.d/oddjobd-mkhomedir.conf -%files libs -%defattr(-,root,root) -%{_libdir}/liboddjob.so.* - -%files python -%defattr(-,root,root) -%{_libdir}/python*/site-packages/* - -%files devel -%defattr(-,root,root) -%{_includedir}/* -%{_libdir}/pkgconfig/oddjob.pc -%{_libdir}/liboddjob.so - -%if %{build_sample} +%if %{build_sample_subpackage} %files sample %defattr(-,root,root) %{_libdir}/%{name}/oddjob-sample.sh @@ -182,16 +141,26 @@ if [ $1 -eq 0 ] ; then /sbin/chkconfig --del oddjobd fi -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - %post mkhomedir +# Adjust older configuration files that may have been modified so that they +# point to the current location of the helper. +cfg=%{_sysconfdir}/oddjobd.conf.d/oddjobd-mkhomedir.conf +if grep -q %{_libdir}/%{name}/mkhomedir $cfg ; then + sed -i 's^%{_libdir}/%{name}/mkhomedir^%{_libexecdir}/%{name}/mkhomedir^g' $cfg +fi if [ -f /var/lock/subsys/oddjobd ] ; then %{dbus_send} --system --dest=com.redhat.oddjob /com/redhat/oddjob com.redhat.oddjob.reload fi exit 0 %changelog +* Wed Jan 27 2010 Nalin Dahyabhai 0.30-1 +- drop the shared library and python bindings, which so far as i can tell + weren't being used, obsoleting them to avoid a mess on upgrades +- move the mkhomedir helper from %%{_libdir}/%{name} to %%{_libexecdir}/%{name} + to make the multilib configuration files agree (#559232) +- use %%global instead of %%define + * Mon Jan 25 2010 Nalin Dahyabhai - 0.29.1-5 - show that we implement force-reload and try-restart in the init script's help message (#522131) diff --git a/sources b/sources index 80094b4..a50810b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -064377e83a3684a5feb9468a93e8d912 oddjob-0.29.1-1.tar.gz +cc3335b7e630cc6bad323016f7d09f20 oddjob-0.30.tar.gz