cleanups; seems working; rel 1

[packages/docker.git] / docker.spec

diff --git a/docker.spec b/docker.spec
index d45f50f7e4ff1c880aa3b9e6e10a261f49e87fdf..016d6b6491df4417f53fb6367794745910f45a3c 100644 (file)
--- a/docker.spec
+++ b/docker.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_with    tests           # build without tests
-%bcond_with    vim                     # build vim syntax package
+%bcond_with    vim                     # build vim syntax package (bundled in vim 7.4.979-2)
 %bcond_with    doc                     # build manual pages
 
 # NOTES
@@ -14,7 +14,7 @@
 Summary:       Docker: the open-source application container engine
 Name:          docker
 Version:       1.12.0
-Release:       0.2
+Release:       1
 License:       Apache v2.0
 Group:         Applications/System
 Source0:       https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -156,13 +156,12 @@ install -p runc/runc $RPM_BUILD_ROOT%{_sbindir}/docker-runc
 # install docker-containerd
 install -p containerd/bin/containerd $RPM_BUILD_ROOT%{_sbindir}/docker-containerd
 install -p containerd/bin/containerd-shim $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-shim
-install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/docker-ctr
+install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-ctr
 
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/docker
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/docker
-#cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 # install udev rules
 install -d $RPM_BUILD_ROOT/lib/udev/rules.d
@@ -207,16 +206,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(754,root,root) /etc/rc.d/init.d/docker
 %attr(755,root,root) %{_bindir}/docker
 %attr(755,root,root) %{_sbindir}/docker-containerd
+%attr(755,root,root) %{_sbindir}/docker-containerd-ctr
 %attr(755,root,root) %{_sbindir}/docker-containerd-shim
-%attr(755,root,root) %{_sbindir}/docker-ctr
 %attr(755,root,root) %{_sbindir}/docker-proxy
 %attr(755,root,root) %{_sbindir}/docker-runc
 %attr(755,root,root) %{_sbindir}/dockerd
 %attr(755,root,root) %{_libexecdir}/docker
 %{systemdunitdir}/docker.service
 /lib/udev/rules.d/80-docker.rules
-#%{_mandir}/man1/lxc-docker.1*
-
 
 %dir %attr(700,root,root) /var/lib/docker
 %dir %attr(700,root,root) /var/lib/docker/containers