Attachment 682936 Details for Bug 885530 – Fixup for the expirer

[patch] Fixup for the expirer

openstack-swift-bz885530-u1.diff (text/plain), 2.40 KB, created by Pete Zaitcev on 2013-01-19 05:48:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2013-01-19 05:48:17 UTC

Size: 2.40 KB

patch

obsolete

>diff --git a/openstack-swift.spec b/openstack-swift.spec
>index e5d7586..db97274 100644
>--- a/openstack-swift.spec
>+++ b/openstack-swift.spec
>@@ -6,7 +6,7 @@
> 
> Name:             openstack-swift
> Version:          1.7.4
>-Release:          5%{?dist}
>+Release:          5.1%{?dist}
> Summary:          OpenStack Object Storage (swift)
> 
> Group:            Development/Languages
>@@ -356,7 +356,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
>@@ -408,12 +407,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*
>@@ -431,13 +434,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
> 
>@@ -446,6 +454,9 @@ fi
> %doc LICENSE doc/build/html
> 
> %changelog
>+* Fri Jan 18 2013 Pete Zaitcev <zaitcev@redhat.com> 1.7.4-5.1
>+- Relocate object-expirer to proxy subpackage
>+
> * Thu Jan 17 2013 Alan Pevec <apevec@redhat.com> 1.7.4-5
> - adjust openstack-swift-functions for new init scripts
>

Flags:

apevec: review+

Actions: View | Diff

Attachments on bug 885530: 676016 | 679944 | 682936