From 75067f00e1a4d6a905d7efd579a7fbceb9ce9f8200bfc223f437166b3b59c92a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 22 Jun 2018 10:05:52 +0000 Subject: [PATCH 1/2] Accepting request 618380 from home:mnhauke - Add subpackages for command line completions for bash and zsh shells OBS-URL: https://build.opensuse.org/request/show/618380 OBS-URL: https://build.opensuse.org/package/show/Archiving/restic?expand=0&rev=6 --- restic.changes | 6 ++++++ restic.spec | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/restic.changes b/restic.changes index 15227cc..3a84d55 100644 --- a/restic.changes +++ b/restic.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 21 21:00:07 UTC 2018 - mardnh@gmx.de + +- Add subpackages for command line completions for bash and + zsh shells + ------------------------------------------------------------------- Thu Mar 1 01:11:07 UTC 2018 - asarai@suse.com diff --git a/restic.spec b/restic.spec index e38dff6..ec244ee 100644 --- a/restic.spec +++ b/restic.spec @@ -31,12 +31,33 @@ Source1: https://github.com/restic/%{name}/releases/download/v%{version}/ Source2: %{name}.keyring # PATCH-FIX-OPENSUSE: Revert to using pre-1.8 Go APIs so we can build on Leap 42.x. Patch1: restic-switch-to-pre-1.8-sort.Stable-API.patch +BuildRequires: bash-completion BuildRequires: golang-packaging +BuildRequires: zsh BuildRequires: golang(API) >= 1.6 +Recommends: %{name}-bash-completion %description restic is a backup program that is fast, efficient and secure. +%package bash-completion +Summary: Bash Completion for %{name} +Group: System/Shells +Requires: %{name} = %{version} +BuildArch: noarch + +%description bash-completion +Bash command line completion support for %{name}. + +%package zsh-completion +Summary: Zsh Completion for %{name} +Group: System/Shells +Requires: %{name} = %{version} +BuildArch: noarch + +%description zsh-completion +Zsh command line completion support for %{name}. + %prep %setup -q %patch1 -p1 @@ -57,6 +78,8 @@ go build -o %{name} -buildmode=pie \ install -D -m0755 %{name} %{buildroot}%{_bindir}/%{name} install -d %{buildroot}%{_mandir}/man1 ./%{name} generate --man %{buildroot}%{_mandir}/man1 +install -Dm0644 doc/bash-completion.sh %{buildroot}%{_datadir}/bash-completion/completions/%{name} +install -Dm0644 doc/zsh-completion.zsh %{buildroot}%{_sysconfdir}/zsh_completion.d/%{name} %files %defattr(-,root,root) @@ -65,4 +88,10 @@ install -d %{buildroot}%{_mandir}/man1 %{_bindir}/restic %{_mandir}/man1/restic*.1* +%files bash-completion +%{_datadir}/bash-completion/completions/%{name} + +%files zsh-completion +%config %{_sysconfdir}/zsh_completion.d/%{name} + %changelog From 6a433384613fe99a0581e87d2d8e3bf57cf2e9d3d015954b78f8b459e0ef6131 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sat, 23 Jun 2018 07:48:45 +0000 Subject: [PATCH 2/2] Accepting request 618508 from home:cyphar:restic - Update to 0.9.1. https://github.com/restic/restic/releases/tag/v0.9.1 See installed /usr/share/doc/packages/restic/CHANGELOG.md - Switch to building with the new "go" metapkg. - Switch to new %license macro. - Fix up restic-*-completion subpackages to use Supplements (to avoid installing shells on people's machines when they don't expect it). OBS-URL: https://build.opensuse.org/request/show/618508 OBS-URL: https://build.opensuse.org/package/show/Archiving/restic?expand=0&rev=7 --- restic-0.8.3.tar.gz | 3 --- restic-0.8.3.tar.gz.asc | 16 ---------------- restic-0.9.1.tar.gz | 3 +++ restic-0.9.1.tar.gz.asc | 16 ++++++++++++++++ restic.changes | 15 +++++++++++++++ restic.spec | 10 ++++++---- 6 files changed, 40 insertions(+), 23 deletions(-) delete mode 100644 restic-0.8.3.tar.gz delete mode 100644 restic-0.8.3.tar.gz.asc create mode 100644 restic-0.9.1.tar.gz create mode 100644 restic-0.9.1.tar.gz.asc diff --git a/restic-0.8.3.tar.gz b/restic-0.8.3.tar.gz deleted file mode 100644 index 9d9d511..0000000 --- a/restic-0.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cf697c88404b180d6d6ff2e7d2c27b2fcb9536da6dbdf15ad4d320af7e8f17c -size 48746281 diff --git a/restic-0.8.3.tar.gz.asc b/restic-0.8.3.tar.gz.asc deleted file mode 100644 index 04f2255..0000000 --- a/restic-0.8.3.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEz48Y8oRFdZc/edThkaaGi9P3qQcFAlqUb70ACgkQkaaGi9P3 -qQeIbQ/8CTg5gYjTp9d0pf+ky2BvcJr1nsINtekW4Jqplm0kiybwnwleNllffra5 -1iWhpCzltgcbMrret/wF9vk0r50uLTvWugOF1GoYrZtcHEIkin3RmdoxKpo9CxRR -XycNo2MzBSdfyCAqgcCSWTNUg5RSiKlJkRVfXr66U5agbDZ43PQzvUWlr4Bt1VUv -Q1+J/LDaq1QmoHqwdSOfYJg4wU4BzT5pcE776uzqQ+DatQziatxxe4T+FfAZUXOv -dOTK2dTKuA5hdTMhkoLexB0Pr2Y7AixxxSnPOG+HrZTpL9OP9dez9mHhD/HbDPT0 -p1sgPo1rTdLPpijm0Ei3F9RyRXnWDqCve081P6lwlJ4FNxZqNb8h+59bUfquDXq8 -xi2adNN6qaUYq6yQsBYbieSxZ/NIVz9BbgdVXO8WrAQ29ehIGMpA/qk8d2/07sRn -sokjd2vB6ip4PkVWzFm6Ov6jRbarKYUY00Uc1quXjj9aVnwyazqB9Xrr4j9YGNlz -jEQ6SyNfEldq/TtzkzosgwzA6pteR+p0LNE3P0rw/iPNO9b0b4cJkbnrjMo2e00N -O+EgUnfR6pbWHjiCY8hPMXeDC8m3+OxQBrbIfnq2Cr3sscK69fzpNLw4UQcO9/1s -8lZt0FyEC6M3ylWpqAA1b1eWFxELqkcz+/T4S+8BhwS9r+WDaMw= -=58wh ------END PGP SIGNATURE----- diff --git a/restic-0.9.1.tar.gz b/restic-0.9.1.tar.gz new file mode 100644 index 0000000..ee712c7 --- /dev/null +++ b/restic-0.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:359d3b8e555a9952f2b98c81ee3dbec8dc441e12789c436ca564762aaacec095 +size 51056544 diff --git a/restic-0.9.1.tar.gz.asc b/restic-0.9.1.tar.gz.asc new file mode 100644 index 0000000..b92aa0c --- /dev/null +++ b/restic-0.9.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEz48Y8oRFdZc/edThkaaGi9P3qQcFAlsc8HMACgkQkaaGi9P3 +qQeUSQ//ZjcIa43rB9UnRB/dAAiC24hajHEwifOBQhydTcEW8qpZVgJRvO5HsZvG +k7D6Y0sHRcsXiTgSrHHvgvxsrJqoGxrWQyw76bs77EBCq+Mt1SrlUsnkSx9SEjlD +OAwSgTPE8zcxdcrd4vMQB3iLF7bJhfvPrpTiGdaSDO4BgKmGbytZwhyHaStJ/EJi +FCNQ78WSrYQiX5HbxNRw23ILcduRM5UNZly0EcSgu87A41TMMQNES/KKPN9w6QC2 +Zkq9pCXRbZc3KKlKim+Orejz+3hhAOi+ZdI5YjHtVfPOv3jSAFybPq3AOVIIgIdZ +tJRajPzYQW/FlIDqcCzUeKDKxjwdmikbGMZzlldDg0ZvFodwEz723iLiL7uK1CMM +CWqFPkOKc//2IvhInBwJxcNFOdu/MsPbAqYN7ReZFP8VR/iVn2AKGOb88SEazxlB +/lW8qC4ivZMYKYh4fasZIiCKuztQ6iqD1ugyiXXtVyx7p4MKXs1tbLkXLP+Il1Ii +Y8MxtiQd/IU8gBnQ/a+YM2B2SphCfupWo4GJl8okFkQVQP1dudTqN1nMuNHhU15Y +b8AXL6yC5l9/DUks9MEE+g9qsYu6TdMAci1efBvek0bmNiC4DrtCl0X2jKwDkAN+ +5OCw+KEK6CuPIhzST1uOhLAmGueZ+d6IhbE75Xlr6rYAATrbqoI= +=zFmW +-----END PGP SIGNATURE----- diff --git a/restic.changes b/restic.changes index 3a84d55..93eac3c 100644 --- a/restic.changes +++ b/restic.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Jun 22 13:33:00 UTC 2018 - asarai@suse.com + +- Update to 0.9.1. + https://github.com/restic/restic/releases/tag/v0.9.1 + See installed /usr/share/doc/packages/restic/CHANGELOG.md +- Switch to building with the new "go" metapkg. +- Switch to new %license macro. + +------------------------------------------------------------------- +Fri Jun 22 13:29:22 UTC 2018 - asarai@suse.com + +- Fix up restic-*-completion subpackages to use Supplements (to avoid + installing shells on people's machines when they don't expect it). + ------------------------------------------------------------------- Thu Jun 21 21:00:07 UTC 2018 - mardnh@gmx.de diff --git a/restic.spec b/restic.spec index ec244ee..1991b2f 100644 --- a/restic.spec +++ b/restic.spec @@ -20,7 +20,7 @@ %define import_path github.com/restic/restic Name: restic -Version: 0.8.3 +Version: 0.9.1 Release: 0 Summary: Fast, secure, efficient backup program License: BSD-2-Clause @@ -32,10 +32,9 @@ Source2: %{name}.keyring # PATCH-FIX-OPENSUSE: Revert to using pre-1.8 Go APIs so we can build on Leap 42.x. Patch1: restic-switch-to-pre-1.8-sort.Stable-API.patch BuildRequires: bash-completion +BuildRequires: go BuildRequires: golang-packaging BuildRequires: zsh -BuildRequires: golang(API) >= 1.6 -Recommends: %{name}-bash-completion %description restic is a backup program that is fast, efficient and secure. @@ -44,6 +43,7 @@ restic is a backup program that is fast, efficient and secure. Summary: Bash Completion for %{name} Group: System/Shells Requires: %{name} = %{version} +Supplements: packageand(restic:bash-completion) BuildArch: noarch %description bash-completion @@ -53,6 +53,7 @@ Bash command line completion support for %{name}. Summary: Zsh Completion for %{name} Group: System/Shells Requires: %{name} = %{version} +Supplements: packageand(restic:zsh) BuildArch: noarch %description zsh-completion @@ -83,8 +84,9 @@ install -Dm0644 doc/zsh-completion.zsh %{buildroot}%{_sysconfdir}/zsh_completion %files %defattr(-,root,root) -%doc *.md *.rst LICENSE +%doc *.md *.rst %doc doc/ +%license LICENSE %{_bindir}/restic %{_mandir}/man1/restic*.1*