[openstack-swift/el6] Relocate object-expirer to proxy subpackage (Pete Zaitcev)

[Alan Pevec]

commit b894cc19b16fad35fe91011ecfceb5cdba9fe898
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Jan 21 10:23:20 2013 +0100

    Relocate object-expirer to proxy subpackage (Pete Zaitcev)

 openstack-swift.spec |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 47620ff..e30717c 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -6,7 +6,7 @@
 
 Name:             openstack-swift
 Version:          1.7.4
-Release:          2.2%{?dist}
+Release:          2.3%{?dist}
 Summary:          OpenStack Object Storage (swift)
 
 Group:            Development/Languages
@@ -355,7 +355,6 @@ fi
 %{_bindir}/swift-dispersion-populate
 %{_bindir}/swift-dispersion-report
 %{_bindir}/swift-recon*
-%{_bindir}/swift-object-expirer
 %{_bindir}/swift-oldies
 %{_bindir}/swift-orphans
 %{_bindir}/swift-form-signature
@@ -407,12 +406,16 @@ fi
 %files object
 %defattr(-,root,root,-)
 %doc etc/object-server.conf-sample etc/rsyncd.conf-sample
-%{_initrddir}/%{name}-object*
-%{_datadir}/%{name}/%{name}-object*.upstart
+%{_initrddir}/%{name}-object
+%{_initrddir}/%{name}-object-auditor
+%{_initrddir}/%{name}-object-replicator
+%{_initrddir}/%{name}-object-updater
+%{_datadir}/%{name}/%{name}-object.upstart
+%{_datadir}/%{name}/%{name}-object-auditor.upstart
+%{_datadir}/%{name}/%{name}-object-replicator.upstart
+%{_datadir}/%{name}/%{name}-object-updater.upstart
 %{_mandir}/man5/object-server.conf.5*
-%{_mandir}/man5/object-expirer.conf.5*
 %{_mandir}/man1/swift-object-auditor.1*
-%{_mandir}/man1/swift-object-expirer.1*
 %{_mandir}/man1/swift-object-info.1*
 %{_mandir}/man1/swift-object-replicator.1*
 %{_mandir}/man1/swift-object-server.1*
@@ -430,13 +433,18 @@ fi
 %files proxy
 %defattr(-,root,root,-)
 %doc etc/proxy-server.conf-sample
+%dir %{_initrddir}/%{name}-object-expirer
 %dir %{_initrddir}/%{name}-proxy
+%{_datadir}/%{name}/%{name}-object-expirer.upstart
 %{_datadir}/%{name}/%{name}-proxy.upstart
+%{_mandir}/man5/object-expirer.conf.5*
 %{_mandir}/man5/proxy-server.conf.5*
+%{_mandir}/man1/swift-object-expirer.1*
 %{_mandir}/man1/swift-proxy-server.1*
 %dir %{_sysconfdir}/swift/proxy-server
 %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/proxy-server.conf
 %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/proxy-server
+%{_bindir}/swift-object-expirer
 %{_bindir}/swift-proxy-server
 %{python_sitelib}/swift/proxy
 
@@ -445,6 +453,9 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
+* Fri Jan 18 2013 Pete Zaitcev <zaitcev at redhat.com> 1.7.4-2.3
+- Relocate object-expirer to proxy subpackage
+
 * Thu Jan 17 2013 Alan Pevec <apevec at redhat.com> 1.7.4-2.2
 - adjust openstack-swift-functions for new init scripts