rpms/oddjob/F-11 oddjob.spec,1.19,1.20 sources,1.8,1.9

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/oddjob/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24738/F-11

Modified Files:
	oddjob.spec sources 
Log Message:
- resync with the devel branch to pick up the 0.30 release



Index: oddjob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/F-11/oddjob.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- oddjob.spec	26 Feb 2009 07:51:08 -0000	1.19
+++ oddjob.spec	29 Jan 2010 19:42:55 -0000	1.20
@@ -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: 3%{?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,7 +17,8 @@ Requires(post): /sbin/service
 Requires(postun): /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(pre): /sbin/chkconfig
-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
@@ -27,43 +28,13 @@ connect to it and issue requests using t
 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.
@@ -73,25 +44,24 @@ Requires: %{name} = %{version}-%{release
 This package contains a trivial sample oddjob service.
 
 %prep
-%setup -q -n %{name}-%{version}-1
+%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
@@ -101,23 +71,29 @@ if ! test -d "$RPM_BUILD_ROOT"/%{_lib}/s
 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
@@ -128,7 +104,6 @@ install -m755 sample/oddjob-sample.sh   
 %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*.*
@@ -136,28 +111,14 @@ install -m755 sample/oddjob-sample.sh   
 %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
@@ -180,16 +141,33 @@ 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 <nalin at redhat.com> 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 <nalin at redhat.com> - 0.29.1-5
+- show that we implement force-reload and try-restart in the init script's
+  help message (#522131)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oddjob/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 May 2008 16:46:45 -0000	1.8
+++ sources	29 Jan 2010 19:42:55 -0000	1.9
@@ -1 +1 @@
-064377e83a3684a5feb9468a93e8d912  oddjob-0.29.1-1.tar.gz
+cc3335b7e630cc6bad323016f7d09f20  oddjob-0.30.tar.gz