/[packages]/cauldron/openstack-swift/current/SPECS/openstack-swift.spec

Diff of /cauldron/openstack-swift/current/SPECS/openstack-swift.spec

Parent Directory | Revision Log | View Patch Patch

-revision 398224 by pterjan,
Thu Jan 17 21:30:27 2013 UTC
+revision 398225 by neoclust,
Wed Feb 13 16:35:55 2013 UTC
 Line 1
- %global with_doc 1
+ %global snaptag 20121113.r2194
- %define bzr_rev 239
  Name:             openstack-swift
- Version:          1.2.99.%{bzr_rev}
+ Version:          1.7.5
- Release:          %mkrel 2
+ Release:          %mkrel 3
- Summary:          OpenStack Object Storage (swift)
+ Summary:          OpenStack Object Storage (Swift)
- Group:            Development/Python
+ Group:            Development/Other
  License:          ASL 2.0
  URL:              http://launchpad.net/swift
- Source0:          http://hudson.openstack.org/job/swift-tarball/lastSuccessfulBuild/artifact/dist/swift-1.3-dev+bzr%{bzr_rev}.tar.gz
+ Source0:          http://launchpad.net/swift/grizzly/%{version}/+download/swift-%{version}.tar.gz
- #Source0:          http://launchpad.net/swift/1.2/1.2.0/+download/swift-1.2.0.tar.gz
+ #Source0:          http://tarballs.openstack.org/swift/swift-%{version}~%{snaptag}.tar.gz
- Source1:          %{name}-functions
+ Source2:          %{name}-account.service
- Source2:          %{name}-account.init
+ Source21:         %{name}-account@.service
- Source3:          %{name}-auth.init
+ Source22:         account-server.conf
- Source4:          %{name}-container.init
+ Source23:         %{name}-account-replicator.service
- Source5:          %{name}-object.init
+ Source24:         %{name}-account-replicator@.service
- Source6:          %{name}-proxy.init
+ Source25:         %{name}-account-auditor.service
- Source20:         %{name}-create-man-stubs.py
+ Source26:         %{name}-account-auditor@.service
+ Source27:         %{name}-account-reaper.service
+ Source28:         %{name}-account-reaper@.service
+ Source4:          %{name}-container.service
+ Source41:         %{name}-container@.service
+ Source42:         container-server.conf
+ Source43:         %{name}-container-replicator.service
+ Source44:         %{name}-container-replicator@.service
+ Source45:         %{name}-container-auditor.service
+ Source46:         %{name}-container-auditor@.service
+ Source47:         %{name}-container-updater.service
+ Source48:         %{name}-container-updater@.service
+ Source5:          %{name}-object.service
+ Source51:         %{name}-object@.service
+ Source52:         object-server.conf
+ Source53:         %{name}-object-replicator.service
+ Source54:         %{name}-object-replicator@.service
+ Source55:         %{name}-object-auditor.service
+ Source56:         %{name}-object-auditor@.service
+ Source57:         %{name}-object-updater.service
+ Source58:         %{name}-object-updater@.service
+ Source59:         %{name}-object-expirer.service
+ # Is it possible to supply an instance-style expirer unit for single-node?
+ Source6:          %{name}-proxy.service
+ Source61:         proxy-server.conf
+ Source62:         object-expirer.conf
+ Source20:         %{name}.tmpfs
+ Source7:          swift.conf
  BuildArch:        noarch
- BuildRequires:    fdupes
  BuildRequires:    dos2unix
  BuildRequires:    python-devel
  BuildRequires:    python-setuptools
+ BuildRequires:    python-netifaces
+ BuildRequires:    python-paste-deploy
  Requires:         python-configobj
  Requires:         python-eventlet >= 0.9.8
  Requires:         python-greenlet >= 0.3.1
+ Requires:         python-paste-deploy
  Requires:         python-simplejson
- Requires:         python-webob
+ Requires:         python-xattr
- Requires:         pyxattr
+ Requires:         python-setuptools
  Requires:         python-netifaces
+ Requires(post):   systemd
+ Requires(preun):  systemd
+ Requires(postun): systemd
  Requires(pre):    shadow-utils
+ Obsoletes:        openstack-swift-auth  <= 1.4.0
+ # swift3 was split off in 1.5.0
+ Requires:         openstack-swift-plugin-swift3
+ # swiftclient was split offf in 1.6.0
+ Requires:         python-swiftclient
  %description
- OpenStack Object Storage (swift) aggregates commodity servers to work together
+ OpenStack Object Storage (Swift) aggregates commodity servers to work together
  in clusters for reliable, redundant, and large-scale storage of static objects.
  Objects are written to multiple hardware devices in the data center, with the
  OpenStack software responsible for ensuring data replication and integrity
-Line 44 
 inexpensive commodity hard drives and se
+Line 83 
 inexpensive commodity hard drives and se
  expensive equipment.
  %package          account
- Summary:          A swift account server
+ Summary:          Account services for Swift
  Group:            System/Cluster
  Requires:         %{name} = %{version}-%{release}
  %description      account
- OpenStack Object Storage (swift) aggregates commodity servers to work together
+ OpenStack Object Storage (Swift) aggregates commodity servers to work together
  in clusters for reliable, redundant, and large-scale storage of static objects.
  This package contains the %{name} account server.
- %package          auth
- Summary:          A swift auth server
- Group:            System/Cluster
- Requires:         %{name} = %{version}-%{release}
- %description      auth
- OpenStack Object Storage (swift) aggregates commodity servers to work together
- in clusters for reliable, redundant, and large-scale storage of static objects.
- This package contains the %{name} auth server.
  %package          container
- Summary:          A swift container server
+ Summary:          Container services for Swift
  Group:            System/Cluster
  Requires:         %{name} = %{version}-%{release}
  %description      container
- OpenStack Object Storage (swift) aggregates commodity servers to work together
+ OpenStack Object Storage (Swift) aggregates commodity servers to work together
  in clusters for reliable, redundant, and large-scale storage of static objects.
  This package contains the %{name} container server.
  %package          object
- Summary:          A swift object server
+ Summary:          Object services for Swift
  Group:            System/Cluster
  Requires:         %{name} = %{version}-%{release}
+ Requires:         rsync >= 3.0
  %description      object
- OpenStack Object Storage (swift) aggregates commodity servers to work together
+ OpenStack Object Storage (Swift) aggregates commodity servers to work together
  in clusters for reliable, redundant, and large-scale storage of static objects.
  This package contains the %{name} object server.
  %package          proxy
- Summary:          A swift proxy server
+ Summary:          A proxy server for Swift
  Group:            System/Cluster
  Requires:         %{name} = %{version}-%{release}
- Requires:         memcached
  %description      proxy
- OpenStack Object Storage (swift) aggregates commodity servers to work together
+ OpenStack Object Storage (Swift) aggregates commodity servers to work together
  in clusters for reliable, redundant, and large-scale storage of static objects.
  This package contains the %{name} proxy server.
- %if 0%{?with_doc}
  %package doc
  Summary:          Documentation for %{name}
  Group:            Documentation
- BuildRequires:    python-sphinx
+ BuildRequires:    python-sphinx >= 1.0
  # Required for generating docs
  BuildRequires:    python-eventlet
  BuildRequires:    python-simplejson
- BuildRequires:    python-webob
  BuildRequires:    pyxattr
- BuildRequires:    python-xmldiff
- BuildRequires:    python-netaddr
- BuildRequires:    python-netifaces
  %description      doc
- OpenStack Object Storage (swift) aggregates commodity servers to work together
+ OpenStack Object Storage (Swift) aggregates commodity servers to work together
  in clusters for reliable, redundant, and large-scale storage of static objects.
  This package contains documentation files for %{name}.
- %endif
  %prep
- %setup -q -n swift-1.3-dev
+ %setup -q -n swift-%{version}
  # Fix wrong-file-end-of-line-encoding warning
  dos2unix LICENSE
  %build
- CFLAGS="%{optflags}" python setup.py build
+ %{__python} setup.py build
+ # Fails unless we create the build directory
+ mkdir -p doc/build
  # Build docs
- %if 0%{?with_doc}
+ %{__python} setup.py build_sphinx
- export PYTHONPATH="$( pwd ):$PYTHONPATH"
+ # Fix hidden-file-or-dir warning
- pushd doc
+ #rm doc/build/html/.buildinfo
- sphinx-build -b html source build/html
- popd
- rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
- %endif
- # Build man stubs
- %{__python} %{SOURCE20} --mandir=./man
  %install
- %{__python} setup.py install --root $RPM_BUILD_ROOT --install-purelib=%{python_sitelib}
+ rm -rf %{buildroot}
- # Init helper functions
+ %{__python} setup.py install -O1 --skip-build --root %{buildroot}
- install -p -D -m 644 %{SOURCE1} %{buildroot}/usr/share/%{name}/functions
+ # systemd units
- # Init scripts
+ install -p -D -m 755 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-account.service
- install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}-account
+ install -p -D -m 755 %{SOURCE21} %{buildroot}%{_unitdir}/%{name}-account@.service
- install -p -D -m 755 %{SOURCE3} %{buildroot}%{_initrddir}/%{name}-auth
+ install -p -D -m 755 %{SOURCE23} %{buildroot}%{_unitdir}/%{name}-account-replicator.service
- install -p -D -m 755 %{SOURCE4} %{buildroot}%{_initrddir}/%{name}-container
+ install -p -D -m 755 %{SOURCE24} %{buildroot}%{_unitdir}/%{name}-account-replicator@.service
- install -p -D -m 755 %{SOURCE5} %{buildroot}%{_initrddir}/%{name}-object
+ install -p -D -m 755 %{SOURCE25} %{buildroot}%{_unitdir}/%{name}-account-auditor.service
- install -p -D -m 755 %{SOURCE6} %{buildroot}%{_initrddir}/%{name}-proxy
+ install -p -D -m 755 %{SOURCE26} %{buildroot}%{_unitdir}/%{name}-account-auditor@.service
- # Install man stubs
+ install -p -D -m 755 %{SOURCE27} %{buildroot}%{_unitdir}/%{name}-account-reaper.service
- for name in $( ls ./man ); do
+ install -p -D -m 755 %{SOURCE28} %{buildroot}%{_unitdir}/%{name}-account-reaper@.service
-     mkdir -p "%{buildroot}%{_mandir}/$name"
+ install -p -D -m 755 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-container.service
-     cp "./man/$name/"*.gz "%{buildroot}%{_mandir}/$name"
+ install -p -D -m 755 %{SOURCE41} %{buildroot}%{_unitdir}/%{name}-container@.service
- done
+ install -p -D -m 755 %{SOURCE43} %{buildroot}%{_unitdir}/%{name}-container-replicator.service
+ install -p -D -m 755 %{SOURCE44} %{buildroot}%{_unitdir}/%{name}-container-replicator@.service
+ install -p -D -m 755 %{SOURCE45} %{buildroot}%{_unitdir}/%{name}-container-auditor.service
+ install -p -D -m 755 %{SOURCE46} %{buildroot}%{_unitdir}/%{name}-container-auditor@.service
+ install -p -D -m 755 %{SOURCE47} %{buildroot}%{_unitdir}/%{name}-container-updater.service
+ install -p -D -m 755 %{SOURCE48} %{buildroot}%{_unitdir}/%{name}-container-updater@.service
+ install -p -D -m 755 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-object.service
+ install -p -D -m 755 %{SOURCE51} %{buildroot}%{_unitdir}/%{name}-object@.service
+ install -p -D -m 755 %{SOURCE53} %{buildroot}%{_unitdir}/%{name}-object-replicator.service
+ install -p -D -m 755 %{SOURCE54} %{buildroot}%{_unitdir}/%{name}-object-replicator@.service
+ install -p -D -m 755 %{SOURCE55} %{buildroot}%{_unitdir}/%{name}-object-auditor.service
+ install -p -D -m 755 %{SOURCE56} %{buildroot}%{_unitdir}/%{name}-object-auditor@.service
+ install -p -D -m 755 %{SOURCE57} %{buildroot}%{_unitdir}/%{name}-object-updater.service
+ install -p -D -m 755 %{SOURCE58} %{buildroot}%{_unitdir}/%{name}-object-updater@.service
+ install -p -D -m 755 %{SOURCE59} %{buildroot}%{_unitdir}/%{name}-object-expirer.service
+ install -p -D -m 755 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-proxy.service
  # Remove tests
  rm -fr %{buildroot}/%{python_sitelib}/test
  # Misc other
  install -d -m 755 %{buildroot}%{_sysconfdir}/swift
  install -d -m 755 %{buildroot}%{_sysconfdir}/swift/account-server
- install -d -m 755 %{buildroot}%{_sysconfdir}/swift/auth-server
  install -d -m 755 %{buildroot}%{_sysconfdir}/swift/container-server
  install -d -m 755 %{buildroot}%{_sysconfdir}/swift/object-server
  install -d -m 755 %{buildroot}%{_sysconfdir}/swift/proxy-server
- fdupes %{buildroot}%{python_sitelib}/swift
+ # Config files
+ install -p -D -m 660 %{SOURCE22} %{buildroot}%{_sysconfdir}/swift/account-server.conf
+ install -p -D -m 660 %{SOURCE42} %{buildroot}%{_sysconfdir}/swift/container-server.conf
+ install -p -D -m 660 %{SOURCE52} %{buildroot}%{_sysconfdir}/swift/object-server.conf
+ install -p -D -m 660 %{SOURCE61} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf
+ install -p -D -m 660 %{SOURCE62} %{buildroot}%{_sysconfdir}/swift/object-expirer.conf
+ install -p -D -m 660 %{SOURCE7} %{buildroot}%{_sysconfdir}/swift/swift.conf
+ # Install pid directory
+ install -d -m 755 %{buildroot}%{_localstatedir}/run/swift
+ install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/account-server
+ install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/container-server
+ install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/object-server
+ install -d -m 755 %{buildroot}%{_localstatedir}/run/swift/proxy-server
+ # Swift run directories
+ mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+ install -p -m 0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/tmpfiles.d/openstack-swift.conf
+ # man pages
+ install -d -m 755 %{buildroot}%{_mandir}/man5
+ for m in doc/manpages/*.5; do
+   install -p -m 0644 $m %{buildroot}%{_mandir}/man5
+ done
+ install -d -m 755 %{buildroot}%{_mandir}/man1
+ for m in doc/manpages/*.1; do
+   install -p -m 0644 $m %{buildroot}%{_mandir}/man1
+ done
  %clean
  rm -rf %{buildroot}
  %pre
- getent group swift >/dev/null || groupadd -r swift
+ getent group swift >/dev/null || groupadd -r swift -g 160
  getent passwd swift >/dev/null || \
- useradd -r -g swift -d %{_sharedstatedir}/swift -s /sbin/nologin \
+ useradd -r -g swift -u 160 -d %{_sharedstatedir}/swift -s /sbin/nologin \
  -c "OpenStack Swift Daemons" swift
  exit 0
  %post account
- %_post_service openstack-swift-account
+ %_post_service %{name}-account
+ %_post_service %{name}-account-replicator
- %preun account
+ %_post_service %{name}-account-auditor
- %_preun_service openstack-swift-account
+ %_post_service %{name}-account-reaper
- %post auth
+ %postun account
- %_post_service openstack-swift-auth
+ %_postun_service %{name}-account
+ %_postun_service %{name}-account-replicator
- %preun auth
+ %_postun_service %{name}-account-auditor
- %_preun_service openstack-swift-auth
+ %_postun_service %{name}-account-reaper
  %post container
- %_post_service openstack-swift-container
+ %_post_service %{name}-container
+ %_post_service %{name}-container-replicator
- %preun container
+ %_post_service %{name}-container-auditor
- %_preun_service openstack-swift-container
+ %_post_service %{name}-container-updater
+ %postun container
+ %_postun_service %{name}-container
+ %_postun_service %{name}-container-replicator
+ %_postun_service %{name}-container-auditor
+ %_postun_service %{name}-container-updater
  %post object
- %_post_service openstack-swift-object
+ %_post_service %{name}-object
+ %_post_service %{name}-object-replicator
- %preun object
+ %_post_service %{name}-object-auditor
- %_preun_service openstack-swift-object
+ %_post_service %{name}-object-updater
+ %postun object
+ %_postun_service %{name}-object
+ %_postun_service %{name}-object-replicator
+ %_postun_service %{name}-object-auditor
+ %_postun_service %{name}-object-updater
  %post proxy
- %_post_service openstack-swift-proxy
+ %_post_service %{name}-proxy
+ %_post_service %{name}-object-expirer
- %preun proxy
+ %postun proxy
- %_preun_service openstack-swift-proxy
+ %_postun_service %{name}-proxy
+ %_postun_service %{name}-object-expirer
  %files
  %defattr(-,root,root,-)
- %doc AUTHORS LICENSE README
+ %doc AUTHORS LICENSE README.md
- %dir /usr/share/%{name}/functions
+ %doc etc/dispersion.conf-sample etc/drive-audit.conf-sample etc/object-expirer.conf-sample
+ %doc etc/swift.conf-sample
+ %{_mandir}/man5/dispersion.conf.5*
+ %{_mandir}/man1/swift-dispersion-populate.1*
+ %{_mandir}/man1/swift-dispersion-report.1*
+ %{_mandir}/man1/swift.1*
+ %{_mandir}/man1/swift-get-nodes.1*
+ %{_mandir}/man1/swift-init.1*
+ %{_mandir}/man1/swift-orphans.1*
+ %{_mandir}/man1/swift-recon.1*
+ %{_mandir}/man1/swift-ring-builder.1*
+ %config(noreplace) %{_sysconfdir}/tmpfiles.d/openstack-swift.conf
  %dir %{_sysconfdir}/swift
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/swift.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift
  %dir %{python_sitelib}/swift
- %dir /usr/share/openstack-swift
- %{_bindir}/st
  %{_bindir}/swift-account-audit
+ %{_bindir}/swift-bench
+ %{_bindir}/swift-bench-client
  %{_bindir}/swift-drive-audit
  %{_bindir}/swift-get-nodes
  %{_bindir}/swift-init
  %{_bindir}/swift-ring-builder
- %{_bindir}/swift-stats-populate
+ %{_bindir}/swift-dispersion-populate
- %{_bindir}/swift-stats-report
+ %{_bindir}/swift-dispersion-report
- # TODO: check if this is the correct subpackage
+ %{_bindir}/swift-recon*
- %{_bindir}/swift-bench
+ %{_bindir}/swift-oldies
- %{_bindir}/swift-log-stats-collector
+ %{_bindir}/swift-orphans
- %{_bindir}/swift-log-uploader
+ %{_bindir}/swift-form-signature
- # ENDTODO
+ %{_bindir}/swift-temp-url
- %{_mandir}/man8/st.8.*
- %{_mandir}/man8/swift-account-audit.8.*
- %{_mandir}/man8/swift-drive-audit.8.*
- %{_mandir}/man8/swift-get-nodes.8.*
- %{_mandir}/man8/swift-init.8.*
- %{_mandir}/man8/swift-ring-builder.8.*
- %{_mandir}/man8/swift-stats-populate.8.*
- %{_mandir}/man8/swift-stats-report.8.*
  %{python_sitelib}/swift/*.py*
  %{python_sitelib}/swift/common
- # TODO: check if this is the correct subpackage
+ %{python_sitelib}/swift-%{version}-*.egg-info
- %{python_sitelib}/swift/stats
- # ENDTODO
- %{python_sitelib}/swift-1.*.egg-info
  %files account
  %defattr(-,root,root,-)
  %doc etc/account-server.conf-sample
- %dir %{_initrddir}/%{name}-account
+ %{_mandir}/man5/account-server.conf.5*
+ %{_mandir}/man1/swift-account-auditor.1*
+ %{_mandir}/man1/swift-account-reaper.1*
+ %{_mandir}/man1/swift-account-replicator.1*
+ %{_mandir}/man1/swift-account-server.1*
+ %{_unitdir}/%{name}-account*.service
  %dir %{_sysconfdir}/swift/account-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/account-server.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/account-server
  %{_bindir}/swift-account-auditor
  %{_bindir}/swift-account-reaper
  %{_bindir}/swift-account-replicator
  %{_bindir}/swift-account-server
- # TODO: check if this is the correct subpackage
- %{_bindir}/swift-account-stats-logger
- # ENDTODO
- %{_mandir}/man8/swift-account-auditor.8.*
- %{_mandir}/man8/swift-account-reaper.8.*
- %{_mandir}/man8/swift-account-replicator.8.*
- %{_mandir}/man8/swift-account-server.8.*
  %{python_sitelib}/swift/account
- %files auth
- %defattr(-,root,root,-)
- %doc etc/auth-server.conf-sample
- %dir %{_initrddir}/%{name}-auth
- %dir %{_sysconfdir}/swift/auth-server
- #%{_bindir}/swift-auth-create-account
- %{_bindir}/swift-auth-recreate-accounts
- %{_bindir}/swift-auth-server
- # TODO: check if this is the correct subpackage
- %{_bindir}/swift-auth-add-user
- %{_bindir}/swift-auth-to-swauth
- %{_bindir}/swift-auth-update-reseller-prefixes
- %{_bindir}/swauth-add-account
- %{_bindir}/swauth-add-user
- %{_bindir}/swauth-cleanup-tokens
- %{_bindir}/swauth-delete-account
- %{_bindir}/swauth-delete-user
- %{_bindir}/swauth-list
- %{_bindir}/swauth-prep
- %{_bindir}/swauth-set-account-service
- # ENDTODO
- %{_mandir}/man8/swift-auth-create-account.8.*
- %{_mandir}/man8/swift-auth-recreate-accounts.8.*
- %{_mandir}/man8/swift-auth-server.8.*
- %{python_sitelib}/swift/auth
  %files container
  %defattr(-,root,root,-)
  %doc etc/container-server.conf-sample
- %dir %{_initrddir}/%{name}-container
+ %{_mandir}/man5/container-server.conf.5*
+ %{_mandir}/man1/swift-container-auditor.1*
+ %{_mandir}/man1/swift-container-replicator.1*
+ %{_mandir}/man1/swift-container-server.1*
+ %{_mandir}/man1/swift-container-sync.1*
+ %{_mandir}/man1/swift-container-updater.1*
+ %{_unitdir}/%{name}-container*.service
  %dir %{_sysconfdir}/swift/container-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/container-server.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/container-server
  %{_bindir}/swift-container-auditor
  %{_bindir}/swift-container-server
  %{_bindir}/swift-container-replicator
  %{_bindir}/swift-container-updater
- %{_mandir}/man8/swift-container-auditor.8.*
+ %{_bindir}/swift-container-sync
- %{_mandir}/man8/swift-container-server.8.*
- %{_mandir}/man8/swift-container-replicator.8.*
- %{_mandir}/man8/swift-container-updater.8.*
  %{python_sitelib}/swift/container
  %files object
  %defattr(-,root,root,-)
- %doc etc/account-server.conf-sample etc/rsyncd.conf-sample
+ %doc etc/object-server.conf-sample etc/rsyncd.conf-sample
- %dir %{_initrddir}/%{name}-object
+ %{_mandir}/man5/object-server.conf.5*
+ %{_mandir}/man1/swift-object-auditor.1*
+ %{_mandir}/man1/swift-object-info.1*
+ %{_mandir}/man1/swift-object-replicator.1*
+ %{_mandir}/man1/swift-object-server.1*
+ %{_mandir}/man1/swift-object-updater.1*
+ %{_unitdir}/%{name}-object.service
+ %{_unitdir}/%{name}-object@.service
+ %{_unitdir}/%{name}-object-auditor.service
+ %{_unitdir}/%{name}-object-auditor@.service
+ %{_unitdir}/%{name}-object-replicator.service
+ %{_unitdir}/%{name}-object-replicator@.service
+ %{_unitdir}/%{name}-object-updater.service
+ %{_unitdir}/%{name}-object-updater@.service
  %dir %{_sysconfdir}/swift/object-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/object-server.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/object-server
  %{_bindir}/swift-object-auditor
  %{_bindir}/swift-object-info
  %{_bindir}/swift-object-replicator
  %{_bindir}/swift-object-server
  %{_bindir}/swift-object-updater
- %{_mandir}/man8/swift-object-auditor.8.*
- %{_mandir}/man8/swift-object-info.8.*
- %{_mandir}/man8/swift-object-replicator.8.*
- %{_mandir}/man8/swift-object-server.8.*
- %{_mandir}/man8/swift-object-updater.8.*
  %{python_sitelib}/swift/obj
  %files proxy
  %defattr(-,root,root,-)
  %doc etc/proxy-server.conf-sample
- %dir %{_initrddir}/%{name}-proxy
+ %{_mandir}/man5/object-expirer.conf.5*
+ %{_mandir}/man5/proxy-server.conf.5*
+ %{_mandir}/man1/swift-object-expirer.1*
+ %{_mandir}/man1/swift-proxy-server.1*
+ %{_unitdir}/%{name}-object-expirer.service
+ %{_unitdir}/%{name}-proxy.service
  %dir %{_sysconfdir}/swift/proxy-server
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/proxy-server.conf
+ %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/object-expirer.conf
+ %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/proxy-server
+ %{_bindir}/swift-object-expirer
  %{_bindir}/swift-proxy-server
- %{_mandir}/man8/swift-proxy-server.8.*
  %{python_sitelib}/swift/proxy
- %if 0%{?with_doc}
  %files doc
  %defattr(-,root,root,-)
  %doc LICENSE doc/build/html
- %endif

 Legend:



Removed from v.398224
 


changed lines


 
Added in v.398225
 Legend:



Removed from v.398224
 


changed lines


 
Added in v.398225
-Removed from v.398224
+Added in v.398225

	ViewVC Help
Powered by ViewVC 1.1.30