[docker-registry] Resolves: rhbz#1111813 - bump to 0.7.3-1 and rhbz#1120214

[lsm5]

commit c10b56297ffeecd9326ea6eb70cebb6d6ae9dc21
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date:   Mon Aug 11 18:53:27 2014 -0500

    Resolves: rhbz#1111813 - bump to 0.7.3-1 and rhbz#1120214

 .gitignore                                   |    1 +
 Support-for-older-Redis-Python-binding.patch |   25 ------------
 docker-registry.service                      |    5 +-
 docker-registry.spec                         |   53 ++++++++-----------------
 sources                                      |    2 +-
 5 files changed, 22 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2deb0d4..921dff7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /5e9ed97939ffd9955f2bea7ff1d37653e39758d6.tar.gz
 /0.6.8.tar.gz
 /0.7.1.tar.gz
+/0.7.3.tar.gz
diff --git a/docker-registry.service b/docker-registry.service
index 7ce16ee..cdc8d89 100644
--- a/docker-registry.service
+++ b/docker-registry.service
@@ -1,13 +1,14 @@
 [Unit]
 Description=Registry server for Docker
-Requires=redis.service
+After=docker.service
+Requires=docker.service
 
 [Service]
 Type=simple
 Environment=DOCKER_REGISTRY_CONFIG=/etc/docker-registry.yml
 EnvironmentFile=-/etc/sysconfig/docker-registry
 WorkingDirectory=#WORKDIR#
-ExecStart=/usr/bin/gunicorn --access-logfile - --debug --max-requests 100 --graceful-timeout 3600 -t 3600 -k gevent -b ${REGISTRY_ADDRESS}:${REGISTRY_PORT} -w $GUNICORN_WORKERS docker_registry.wsgi:application
+ExecStart=/usr/bin/docker run -p 5000:5000 registry
 Restart=on-failure
 
 [Install]
diff --git a/docker-registry.spec b/docker-registry.spec
index 2d5db56..9be1ce6 100644
--- a/docker-registry.spec
+++ b/docker-registry.spec
@@ -1,26 +1,24 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+# removed "|| 0%{?rhel} >= 7" as the rhel version is maintained separately
+%if 0%{?fedora} >= 19
 %bcond_without  systemd
 %endif
 
 Summary:        Registry server for Docker
 Name:           docker-registry
-Version:        0.7.1
-Release:        3%{?dist}
+Version:        0.7.3
+Release:        1%{?dist}
 License:        ASL 2.0
-URL:            https://github.com/dotcloud/docker-registry
-Source:         https://github.com/dotcloud/docker-registry/archive/%{version}.tar.gz
+URL:            https://github.com/dotcloud/%{name}
+Source:         https://github.com/dotcloud/%{name}/archive/%{version}.tar.gz
 Source1:        docker-registry.service
 Source2:        docker-registry.sysconfig
 Source3:        docker-registry.sysvinit
 
-# Support for older Redis Python binding in EPEL
-Patch0:         Support-for-older-Redis-Python-binding.patch
 Patch1:         Don-t-use-flask-cors-not-available-in-Fedora-yet.patch
 
-BuildRequires:    python2-devel
-
+BuildRequires:      python2-devel
 %if %{with systemd}
 BuildRequires:      systemd
 Requires(post):     systemd
@@ -32,44 +30,25 @@ Requires(preun):    chkconfig
 Requires(postun):   initscripts
 Requires:           python-importlib
 %endif
-
-Requires:       python-boto
-Requires:       python-flask
-Requires:       PyYAML
-Requires:       python-simplejson
-Requires:       python-requests
-Requires:       python-gunicorn
-Requires:       python-gevent
-Requires:       python-blinker
-Requires:       python-glanceclient
-Requires:       python-keystoneclient
-Requires:       python-redis
-Requires:       python-rsa
-Requires:       python-backports-lzma
-Requires:       python-jinja2
-Requires:       python-sqlalchemy
-Requires:       redis
-
-BuildArch:      noarch
+Requires:           docker-io
+BuildArch:          noarch
 
 %description
 Registry server for Docker (hosting/delivering of repositories and images).
 
 %prep
-%setup -q -n docker-registry-%{version}
+%setup -q -n %{name}-%{version}
 
 # Remove the golang implementation
 # It's not the main one (yet?)
 rm -rf contrib/golang_impl
 
-%if !%{with systemd}
-%patch0 -p1
-%endif
-
 %patch1 -p1
 
+%build
+%{__python} setup.py build
+
 %install
-install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_sysconfdir}/sysconfig
 install -d %{buildroot}%{_sharedstatedir}/%{name}
 install -d %{buildroot}%{python_sitelib}/%{name}
@@ -79,13 +58,11 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 %if %{with systemd}
 install -d %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-
 # Make sure we set proper WorkingDir in the systemd service file
 sed -i "s|#WORKDIR#|%{python_sitelib}/%{name}|" %{buildroot}%{_unitdir}/%{name}.service
 %else
 install -d %{buildroot}%{_initddir}
 install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/%{name}
-
 # Make sure we set proper wrking dir in the sysvinit file
 sed -i "s|#WORKDIR#|%{python_sitelib}/%{name}|" %{buildroot}%{_initddir}/%{name}
 %endif
@@ -163,6 +140,10 @@ fi
 %endif
 
 %changelog
+* Mon Aug 11 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0.7.3-1
+- Resolves: rhbz#1111813 - upstream release 0.7.3
+- Resolves: rhbz#1120214 - unitfile doesn't use redis.service
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index d17efe9..01faffa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae9fb31c6c6977d5043946d9578dd071  0.7.1.tar.gz
+b0425baed04cdf166df8334ccc846761  0.7.3.tar.gz