[openstack-swift] Fix expirer to run in proxy when object is not installed

[Pete Zaitcev]

commit f438ff3c36ef3a9708b47e8f569b997f316beb55
Author: Pete Zaitcev <zaitcev at kotori.zaitcev.us>
Date:   Wed Mar 6 19:15:20 2013 -0700

    Fix expirer to run in proxy when object is not installed
    
    As it turns out, object expirer needs common classes located
    in swift.obj. So, package swift.obj in the main package together
    with swift.common.

 object-expirer.conf  |   25 +------------------------
 openstack-swift.spec |    9 ++++++---
 2 files changed, 7 insertions(+), 27 deletions(-)
---
diff --git a/object-expirer.conf b/object-expirer.conf
index cef0f0f..b75963c 100644
--- a/object-expirer.conf
+++ b/object-expirer.conf
@@ -1,40 +1,17 @@
 [DEFAULT]
-# swift_dir = /etc/swift
-# user = swift
-# You can specify default log routing here if you want:
-# log_name = swift
-# log_facility = LOG_LOCAL0
-# log_level = INFO
-# log_address = /dev/log
-# comma separated list of functions to call to setup custom log handlers.
-# functions get passed: conf, name, log_to_console, log_route, fmt, logger,
-# adapted_logger
-# log_custom_handlers =
-# If set, log_udp_host will override log_address
-# log_udp_host =
-# log_udp_port = 514
-# You can enable StatsD logging here:
-# log_statsd_host = localhost
-# log_statsd_port = 8125
-# log_statsd_default_sample_rate = 1
-# log_statsd_metric_prefix =
 
 [object-expirer]
-# interval = 300
 # auto_create_account_prefix = .
-# report_interval = 300
 
 [pipeline:main]
 pipeline = catch_errors cache proxy-server
 
 [app:proxy-server]
 use = egg:swift#proxy
-# See proxy-server.conf-sample for options
 
 [filter:cache]
 use = egg:swift#memcache
-# See proxy-server.conf-sample for options
+memcache_servers = 127.0.0.1:11211
 
 [filter:catch_errors]
 use = egg:swift#catch_errors
-# See proxy-server.conf-sample for options
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 9f49d8c..79a9f9a 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -6,7 +6,7 @@
 
 Name:             openstack-swift
 Version:          1.7.5
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
@@ -353,6 +353,7 @@ exit 0
 %{_bindir}/swift-temp-url
 %{python_sitelib}/swift/*.py*
 %{python_sitelib}/swift/common
+%{python_sitelib}/swift/obj
 %{python_sitelib}/swift-%{version}-*.egg-info
 
 %files account
@@ -421,11 +422,10 @@ exit 0
 %{_bindir}/swift-object-replicator
 %{_bindir}/swift-object-server
 %{_bindir}/swift-object-updater
-%{python_sitelib}/swift/obj
 
 %files proxy
 %defattr(-,root,root,-)
-%doc etc/proxy-server.conf-sample
+%doc etc/proxy-server.conf-sample etc/object-expirer.conf-sample
 %{_mandir}/man5/object-expirer.conf.5*
 %{_mandir}/man5/proxy-server.conf.5*
 %{_mandir}/man1/swift-object-expirer.1*
@@ -446,6 +446,9 @@ exit 0
 %doc LICENSE doc/build/html
 
 %changelog
+* Thu Feb 14 2013 Pete Zaitcev <zaitcev at redhat.com> - 1.7.5-4
+- Fix the moved object-expirer so it runs with object is not installed
+
 * Thu Feb 14 2013 Pete Zaitcev <zaitcev at redhat.com> - 1.7.5-3
 - Add /var/cache/recon, by bz#870409, equally affects all Fedora versions