X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=lxc-docker.spec;h=46ebcd96ae6aae10e1cf4f98a0d78cebc821263f;hb=864293204566cb7b122c5bcf28a88d7df5dd9c31;hp=4f6a57645dcf0adcf8280edf17b7b6c678870247;hpb=c69d20bf58546134ea72b59d75c89e7274a8977d;p=packages%2Fdocker.git

diff --git a/lxc-docker.spec b/lxc-docker.spec
index 4f6a576..46ebcd9 100644
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -4,29 +4,36 @@
 
 Summary:	Docker: the Linux container engine
 Name:		lxc-docker
-Version:	0.6.2
+Version:	0.9.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:	41df68b4b4f1e03ab1d0964f4b73f440
-Source100:	https://raw.github.com/dotcloud/docker/v0.5.3/Makefile
-# Source100-md5:	44cc86a37fc5dfe59596076d346da20d
+# Source0-md5:	5969bb91ec4f17aa381831046fb15531
+Source5:	%{name}.service
 Source6:	%{name}.init
 URL:		http://github.com/dotcloud/docker
-BuildRequires:	golang >= 1.1.2
+BuildRequires:	btrfs-progs-devel
+BuildRequires:	device-mapper-devel
+BuildRequires:	golang >= 1.2.1
 BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	sqlite3-devel >= 3.7.9
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
+Requires:	iproute2 >= 3.5
 Requires:	iptables
-Requires:	lxc
+Requires:	lxc >= 0.8
 Requires:	rc-scripts >= 0.4.0.10
-Requires:	tar
+Requires:	tar >= 1:1.26
 Requires:	uname(release) >= 3.8
 Requires:	xz
+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
@@ -34,6 +41,7 @@ ExclusiveArch:	%{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		bash_compdir	%{_datadir}/bash-completion/completions
+%define		_vimdatadir		%{_datadir}/vim
 
 # binary stripped or something
 %define		_enable_debug_packages 0
@@ -47,7 +55,7 @@ Docker is a great building block for automating distributed systems:
 large-scale web deployments, database clusters, continuous deployment
 systems, private PaaS, service-oriented architectures, etc.
 
-%package -n bash-completion-lxc-docker
+%package -n bash-completion-%{name}
 Summary:	bash-completion for Docker
 Summary(pl.UTF-8):	bashowe uzupełnianie nazw dla Dockera
 Group:		Applications/Shells
@@ -63,33 +71,57 @@ This package provides bash-completion for Docker.
 %description -n bash-completion-lxc-docker -l pl.UTF-8
 Pakiet ten dostarcza bashowe uzupełnianie nazw dla Dockera.
 
+%package -n vim-syntax-%{name}
+Summary:	Vim syntax: Docker
+Group:		Applications/Editors/Vim
+Requires:	%{name} = %{version}-%{release}
+Requires:	vim-rt >= 4:7.2.170
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description -n vim-syntax-%{name}
+This plugin provides syntax highlighting in Dockerfile.
+
 %prep
 %setup -q -n docker-%{version}
-cp -p %{SOURCE100} .
+%patch0 -p1
 
-%build
-# avoid interfering with builder env
-unset GIT_WORK_TREE
-unset GIT_DIR
-%{__make} VERBOSE=1
+install -d vendor/src/github.com/dotcloud
+ln -s $(pwd) vendor/src/github.com/dotcloud/docker
 
-%if %{with tests}
-%{__make} test
-%endif
+%build
+export GOPATH=$(pwd)/vendor
+install -d build
+cd build
+VERSION=%{version}
+GITCOMMIT=pld-%{version}-%{release} # use RPM_PACKAGE_RELEASE for this
+# Use these flags when compiling the tests and final binary
+# 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 -p bin/docker $RPM_BUILD_ROOT%{_bindir}/lxc-docker
+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
+#cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 # bash completion
 install -d $RPM_BUILD_ROOT%{bash_compdir}
-cp -p contrib/docker.bash $RPM_BUILD_ROOT%{bash_compdir}/lxc-docker
+cp -p contrib/completion/bash/docker $RPM_BUILD_ROOT%{bash_compdir}/lxc-docker
 ln -s lxc-docker $RPM_BUILD_ROOT%{bash_compdir}/docker
 
+# vim syntax
+install -d $RPM_BUILD_ROOT%{_vimdatadir}
+cp -a contrib/syntax/vim/* $RPM_BUILD_ROOT%{_vimdatadir}
+%{__rm} $RPM_BUILD_ROOT%{_vimdatadir}/{LICENSE,README.md}
+
 %pre
 %groupadd -g 296 docker
 
@@ -114,16 +146,25 @@ 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
-%{_mandir}/man1/lxc-docker.1*
+%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
 %dir %attr(700,root,root) /var/lib/docker/graph
 %dir %attr(700,root,root) /var/lib/docker/volumes
 
-%files -n bash-completion-lxc-docker
+%files -n bash-completion-%{name}
 %defattr(644,root,root,755)
 %{bash_compdir}/lxc-docker
 %{bash_compdir}/docker
+
+%files -n vim-syntax-%{name}
+%defattr(644,root,root,755)
+%doc contrib/syntax/vim/{README.md,LICENSE}
+%{_vimdatadir}/doc/dockerfile.txt
+%{_vimdatadir}/ftdetect/dockerfile.vim
+%{_vimdatadir}/syntax/dockerfile.vim