diff --git a/.gitignore b/.gitignore index 47a3ab9..b50aaf1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1 @@ -/swift-1.7.5.tar.gz -/swift-1.7.6.tar.gz -/swift-1.8.0.tar.gz -/swift-1.9.0.tar.gz -/swift-1.9.1.tar.gz -/swift-1.10.0.rc1.tar.gz -/swift-1.10.0.tar.gz -/swift-1.11.0.tar.gz -/swift-1.12.0.tar.gz -/swift-1.13.1.rc2.tar.gz -/swift-1.13.1.tar.gz -/swift-2.0.0.tar.gz -/swift-2.1.0.tar.gz -/swift-2.2.0.rc1.tar.gz -/swift-2.2.0.tar.gz +/swift-2.3.0rc2.tar.gz diff --git a/0001-remove-runtime-requirement-on-pbr.patch b/0001-remove-runtime-requirement-on-pbr.patch deleted file mode 100644 index f4fbb02..0000000 --- a/0001-remove-runtime-requirement-on-pbr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4be54399745009fd48b096a78f8c994904d3d87c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Wed, 9 Oct 2013 12:38:40 +0100 -Subject: [PATCH] remove runtime requirement on pbr - ---- - swift/__init__.py | 18 ++---------------- - 1 file changed, 2 insertions(+), 16 deletions(-) - -diff --git a/swift/__init__.py b/swift/__init__.py -index 9d0e889..d7a4012 100644 ---- a/swift/__init__.py -+++ b/swift/__init__.py -@@ -16,22 +16,8 @@ - import os - import gettext - --import pkg_resources -- --try: -- # First, try to get our version out of PKG-INFO. If we're installed, -- # this'll let us find our version without pulling in pbr. After all, if -- # we're installed on a system, we're not in a Git-managed source tree, so -- # pbr doesn't really buy us anything. -- __version__ = __canonical_version__ = pkg_resources.get_provider( -- pkg_resources.Requirement.parse('swift')).version --except pkg_resources.DistributionNotFound: -- # No PKG-INFO? We're probably running from a checkout, then. Let pbr do -- # its thing to figure out a version number. -- import pbr.version -- _version_info = pbr.version.VersionInfo('swift') -- __version__ = _version_info.release_string() -- __canonical_version__ = _version_info.version_string() -+__version__ = "%RPMVERSION%-%RPMRELEASE%" -+__canonical_version__ = "%RPMVERSION%" - - _localedir = os.environ.get('SWIFT_LOCALEDIR') - _t = gettext.translation('swift', localedir=_localedir, fallback=True) diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch deleted file mode 100644 index a59c0f2..0000000 --- a/0002-Add-fixes-for-building-the-doc-package.patch +++ /dev/null @@ -1,39 +0,0 @@ -From edb571946055deef57341ed359ac1abd2f910a86 Mon Sep 17 00:00:00 2001 -From: Alan Pevec -Date: Thu, 5 Jan 2012 00:03:00 +0100 -Subject: [PATCH] Add fixes for building the doc package -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- always reference the swift module from the package we're building -- use oslo.sphinx from python-oslo-sphinx 1.x -Based on Nova/Glance EPEL patch by Pádraig Brady ---- - doc/source/conf.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/doc/source/conf.py b/doc/source/conf.py -index 5d2fbd3..3fa01c3 100644 ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -20,8 +20,8 @@ import datetime - # If extensions (or modules to document with autodoc) are in another directory, - # add these directories to sys.path here. If the directory is relative to the - # documentation root, use os.path.abspath to make it absolute, like shown here. --sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'), -- os.path.abspath('../bin')]) -+sys.path.extend([os.path.abspath('../../swift'), os.path.abspath('../..'), -+ os.path.abspath('../../bin')]) - - # -- General configuration ---------------------------------------------------- - -@@ -29,7 +29,7 @@ sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'), - # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. - extensions = ['sphinx.ext.autodoc', - 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', -- 'sphinx.ext.ifconfig', 'oslosphinx'] -+ 'sphinx.ext.ifconfig', 'oslo.sphinx'] - todo_include_todos = True - - # Add any paths that contain templates here, relative to this directory. diff --git a/openstack-swift.spec b/openstack-swift.spec index fbeb796..5cda691 100644 --- a/openstack-swift.spec +++ b/openstack-swift.spec @@ -1,19 +1,18 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%endif +%global release_name kilo +%global milestone .0rc2 +%global service swift -%global release_name juno -%global milestone rc1 +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: openstack-swift -Version: 2.2.0 -Release: 4%{?dist} +Version: 2.3 +Release: 0.1%{?milestone}%{?dist} Summary: OpenStack Object Storage (Swift) Group: Development/Languages License: ASL 2.0 URL: http://launchpad.net/swift -Source0: https://launchpad.net/swift/juno/%{version}/+download/swift-%{version}.tar.gz +Source0: http://launchpad.net/%{service}/%{release_name}/%{release_name}-rc2/+download/%{service}-%{upstream_version}.tar.gz Source2: %{name}-account.service Source21: %{name}-account@.service @@ -54,25 +53,21 @@ Source71: %{name}.rsyslog Source72: %{name}.logrotate ## Based at https://github.com/redhat-openstack/swift/ -# -# patches_base=2.2.0.rc1 -# -Patch0001: 0001-remove-runtime-requirement-on-pbr.patch -Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools -BuildRequires: python-oslo-sphinx BuildRequires: python-pbr Requires: python-configobj -Requires: python-eventlet >= 0.9.15 +Requires: python-eventlet >= 0.16.1 Requires: python-greenlet >= 0.3.1 Requires: python-paste-deploy Requires: python-simplejson Requires: pyxattr Requires: python-setuptools Requires: python-netifaces +Requires: python-dns +Requires: python-pyeclib BuildRequires: systemd Requires(post): systemd @@ -147,12 +142,8 @@ This package contains the %{name} proxy server. %package doc Summary: Documentation for %{name} Group: Documentation -%if 0%{?rhel} == 6 -BuildRequires: python-sphinx10 >= 1.0 -%endif -%if 0%{?fedora} >= 14 || 0%{?rhel} >= 7 BuildRequires: python-sphinx >= 1.0 -%endif +BuildRequires: python-oslo-sphinx >= 2.5.0 # Required for generating docs (otherwise py-modindex.html is missing) BuildRequires: python-eventlet BuildRequires: pyxattr @@ -164,32 +155,17 @@ in clusters for reliable, redundant, and large-scale storage of static objects. This package contains documentation files for %{name}. %prep -%setup -q -n swift-%{version} - -%patch0001 -p1 -%patch0002 -p1 - -# Remove bundled egg-info -rm -rf swift.egg-info +%setup -q -n swift-%{upstream_version} # Let RPM handle the dependencies rm -f requirements.txt -# Remove dependency on pbr and set version as per rpm -sed -i 's/%RPMVERSION%/%{version}/; s/%RPMRELEASE%/%{release}/' swift/__init__.py - %build %{__python} setup.py build # Fails unless we create the build directory mkdir -p doc/build # Build docs -%if 0%{?fedora} >= 14 || 0%{?rhel} >= 7 %{__python} setup.py build_sphinx -%endif -%if 0%{?rhel} == 6 -export PYTHONPATH="$( pwd ):$PYTHONPATH" -SPHINX_DEBUG=1 sphinx-1.0-build -b html doc/source doc/build/html -%endif # Fix hidden-file-or-dir warning #rm doc/build/html/.buildinfo @@ -343,7 +319,8 @@ exit 0 %files %defattr(-,root,root,-) -%doc AUTHORS LICENSE README.md +%license LICENSE +%doc README.md %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* @@ -382,6 +359,7 @@ exit 0 %{python_sitelib}/swift/common %{python_sitelib}/swift/account %{python_sitelib}/swift/obj +%{python_sitelib}/swift/locale %{python_sitelib}/swift-%{version}*.egg-info %files account @@ -450,6 +428,7 @@ exit 0 %{_bindir}/swift-object-replicator %{_bindir}/swift-object-server %{_bindir}/swift-object-updater +%{_bindir}/swift-object-reconstructor %files proxy %defattr(-,root,root,-) diff --git a/proxy-server.conf b/proxy-server.conf index 190326b..3082c85 100644 --- a/proxy-server.conf +++ b/proxy-server.conf @@ -41,6 +41,9 @@ use = egg:swift#dlo [filter:gatekeeper] use = egg:swift#gatekeeper +[filter:proxy-logging] +use = egg:swift#proxy_logging + [filter:keystone] use = egg:swift#keystoneauth operator_roles = admin, SwiftOperator diff --git a/sources b/sources index 8e0abb1..363da3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5ca0552d444c6c3e5574545fd90b787 swift-2.2.0.tar.gz +696fd1b43d407dc3a09dc885305cb72f swift-2.3.0rc2.tar.gz