Adapterise

[packages/docker.git] / lxc-docker.spec

diff --git a/lxc-docker.spec b/lxc-docker.spec
index 1434388907ce09d01ffa4fc3840218b5b417f3b6..63a2d203c98186c63d178778775e1adf8cc1ade8 100644 (file)
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -4,14 +4,16 @@
 
 Summary:       Docker: the Linux container engine
 Name:          lxc-docker
-Version:       0.6.6
+Version:       0.7.0
 Release:       1
 License:       Apache v2.0
 Group:         Applications/System
 Source0:       https://github.com/dotcloud/docker/archive/v%{version}/docker-%{version}.tar.gz
-# Source0-md5: f2c0c73d9bd39a33bb73e466ca8f58c9
+# Source0-md5: bc5e2aa1fbcd3ab8fac1a4f6a4613a16
+Source5:       %{name}.service
 Source6:       %{name}.init
 URL:           http://github.com/dotcloud/docker
+BuildRequires: device-mapper-devel
 BuildRequires: golang >= 1.1.2
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: sqlite3-devel >= 3.7.9
@@ -30,6 +32,7 @@ Suggests:     git-core >= 1.7
 Suggests:      libcgroup
 Suggests:      xz >= 1:4.9
 Provides:      group(docker)
+Patch0:                %{name}-nosha.patch
 # only runs on x64 hosts for now:
 # https://github.com/dotcloud/docker/issues/136
 # https://github.com/dotcloud/docker/issues/611
@@ -81,6 +84,7 @@ This plugin provides syntax highlighting in Dockerfile.
 
 %prep
 %setup -q -n docker-%{version}
+%patch0 -p1
 
 install -d vendor/src/github.com/dotcloud
 ln -s $(pwd) vendor/src/github.com/dotcloud/docker
@@ -95,11 +99,14 @@ GITCOMMIT=pld-%{release} # use RPM_PACKAGE_RELEASE for this
 # without '-d', as that fails now
 LDFLAGS="-X main.GITCOMMIT $GITCOMMIT -X main.VERSION $VERSION -w"
 go build -v -ldflags "$LDFLAGS" -a github.com/dotcloud/docker/docker
+go build -v -ldflags "$LDFLAGS" -a ../dockerinit/dockerinit.go
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,/var/lib/docker/{containers,graph,volumes}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,%{systemdunitdir},/var/lib/docker/{containers,graph,volumes}}
 install -p build/docker $RPM_BUILD_ROOT%{_bindir}/lxc-docker
+install -p build/dockerinit $RPM_BUILD_ROOT%{_bindir}/dockerinit
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/lxc-docker.service
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxc-docker
 ln -s lxc-docker $RPM_BUILD_ROOT%{_bindir}/docker
 #cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -138,9 +145,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md CHANGELOG.md CONTRIBUTING.md FIXME LICENSE AUTHORS NOTICE MAINTAINERS
+%{systemdunitdir}/lxc-docker.service
 %attr(754,root,root) /etc/rc.d/init.d/lxc-docker
 %attr(755,root,root) %{_bindir}/lxc-docker
 %attr(755,root,root) %{_bindir}/docker
+%attr(755,root,root) %{_bindir}/dockerinit
 #%{_mandir}/man1/lxc-docker.1*
 %dir %attr(700,root,root) /var/lib/docker
 %dir %attr(700,root,root) /var/lib/docker/containers