[docker-io/f20] 0.7.4-1 (BZ #1049793)

[Lokesh Mandvekar]

commit e2e1a68edeb7daf9babd73a36fc26cc25df6e8e9
Author: Lokesh Mandvekar <lsm5(a)redhat.com&gt;
Date:   Thu Jan 9 08:49:12 2014 -0500

    0.7.4-1 (BZ #1049793)
    
    Signed-off-by: Lokesh Mandvekar <lsm5(a)redhat.com&gt;

 80-docker.rules |    2 --
 docker-io.spec  |   14 +++++++++-----
 docker.service  |    6 +++---
 sources         |    2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 5e58c63..b2dc8ca 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -9,12 +9,12 @@
 %global debug_package %{nil}
 %global gopath  %{_datadir}/gocode
 
-%global commit      8502ad4ba7b5410eb55f3517a801b33f61b1f625
+%global commit      010d74ec2f3dfefea5cafa602bce5cdeac3a0c19
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           docker-io
-Version:        0.7.3
-Release:        3%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
@@ -28,7 +28,6 @@ Source1:        docker.service
 # having .sysvinit and .sysconfig makes things clear
 Source2:        docker.sysconfig
 Source3:        docker.sysvinit
-Source4:        80-docker.rules
 BuildRequires:  gcc
 BuildRequires:  glibc-static
 BuildRequires:  golang(github.com/gorilla/mux)
@@ -115,7 +114,7 @@ install -d %{buildroot}%{_initddir}
 install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/docker
 %endif
 install -d %{buildroot}%{_sysconfdir}/udev/rules.d
-install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/udev/rules.d
+install -p -m 755 contrib/udev/80-docker.rules %{buildroot}%{_sysconfdir}/udev/rules.d
 
 %pre
 getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -167,6 +166,11 @@ fi
 %{_sysconfdir}/udev/rules.d/80-docker.rules
 
 %changelog
+* Thu Jan 09 2014 Lokesh Mandvekar <lsm5(a)redhat.com&gt; - 0.7.4-1
+- upstream version bump to 0.7.4 (BZ #1049793)
+- udev rules file from upstream contrib
+- unit file firewalld not used, description changes
+
 * Mon Jan 06 2014 Lokesh Mandvekar <lsm5(a)redhat.com&gt; - 0.7.3-3
 - udev rules typo fixed (BZ 1048775)
 
diff --git a/docker.service b/docker.service
index 220fc98..dc7cc45 100644
--- a/docker.service
+++ b/docker.service
@@ -1,7 +1,7 @@
 [Unit]
-Description=Docker container management daemon
-Wants=firewalld.service
-After=firewalld.service
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+After=network.target
 
 [Service]
 Type=simple
diff --git a/sources b/sources
index e1592d4..a8efe00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e28377287589929aa8361889d1490075  v0.7.3.tar.gz
+4d7d2b04f7de6272526afdc6bf41429a  v0.7.4.tar.gz