Merge pull request #42 from seemethere/remove_telemetry_plugin_fedora_26

Removes telemetry mentions from Fedora 26
Upstream-commit: 4c678098414f0baa6bd19ad765235f2db399650b
Component: packaging
This commit is contained in:
Andrew Hsu
2017-07-25 11:39:36 -07:00
committed by GitHub

View File

@ -6,7 +6,6 @@ Group: Tools/Docker
License: ASL 2.0
Source0: engine.tgz
Source1: cli.tgz
Source2: telemetry_%{_plugin_version}.tgz
URL: https://www.docker.com
Vendor: Docker
Packager: Docker <support@docker.com>
@ -140,12 +139,6 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do
cp "cli/$cli_file" "build-docs/cli-$cli_file"
done
# add telemetry plugin
install -d $RPM_BUILD_ROOT/var/lib/docker/plugins/tar
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/lib/docker/plugins/tar
install -p -m 644 plugin/.plugin-metadata $RPM_BUILD_ROOT/var/lib/docker/plugins/tar
install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load-telemetry-plugin
# list files owned by the package here
%files
%doc build-docs/engine-AUTHORS build-docs/engine-CHANGELOG.md build-docs/engine-CONTRIBUTING.md build-docs/engine-LICENSE build-docs/engine-MAINTAINERS build-docs/engine-NOTICE build-docs/engine-README.md
@ -171,9 +164,6 @@ install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load-
/usr/share/vim/vimfiles/ftdetect/dockerfile.vim
/usr/share/vim/vimfiles/syntax/dockerfile.vim
/usr/share/nano/Dockerfile.nanorc
/var/lib/docker/plugins/tar/telemetry_%{_plugin_version}.tgz
/var/lib/docker/plugins/tar/.plugin-metadata
/usr/bin/load-telemetry-plugin
%pre
if [ $1 -gt 0 ] ; then