forked from pool/bash-completion
Accepting request 600355 from shells
- Add patch bash-completion-2.7-unRAR-remove.patch that is due legal issue the unRAR part of 7z had been removed (boo#1077978, boo#1090515) - Use %license instead of %doc [bsc#1082318] OBS-URL: https://build.opensuse.org/request/show/600355 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash-completion?expand=0&rev=38
This commit is contained in:
commit
f8529d754b
26
bash-completion-2.7-unRAR-remove.patch
Normal file
26
bash-completion-2.7-unRAR-remove.patch
Normal file
@ -0,0 +1,26 @@
|
||||
Due legal issue the unRAR part of 7z had been removed (boo#1077978, boo#1090515)
|
||||
|
||||
---
|
||||
completions/7z | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- completions/7z
|
||||
+++ completions/7z 2018-04-24 09:17:49.392549710 +0000
|
||||
@@ -75,7 +75,7 @@ _7z()
|
||||
else
|
||||
COMPREPLY=( $( compgen -P${cur:0:2} -W '7z apm arj bzip2 cab
|
||||
chm cpio cramfs deb dmg elf fat flv gzip hfs iso lzh lzma
|
||||
- lzma86 macho mbr mslz mub nsis ntfs pe ppmd rar rpm
|
||||
+ lzma86 macho mbr mslz mub nsis ntfs pe ppmd rpm
|
||||
squashfs swf swfc tar udf vhd wim xar xz z zip' \
|
||||
-- "${cur:2}" ) )
|
||||
fi
|
||||
@@ -101,7 +101,7 @@ _7z()
|
||||
_filedir_xspec unzip
|
||||
[[ $mode == w ]] &&
|
||||
_filedir '@(7z|bz2|swf|?(g)tar|?(t)[bglx]z|tb?(z)2|wim)' ||
|
||||
- _filedir '@(7z|arj|bz2|cab|chm|cpio|deb|dmg|flv|gem|img|iso|lz[ah]|lzma?(86)|pmd|[rx]ar|rpm|sw[fm]|?(g)tar|taz|?(t)[bglx]z|tb?(z)2|vhd|wim|Z)'
|
||||
+ _filedir '@(7z|arj|bz2|cab|chm|cpio|deb|dmg|flv|gem|img|iso|lz[ah]|lzma?(86)|pmd|xar|rpm|sw[fm]|?(g)tar|taz|?(t)[bglx]z|tb?(z)2|vhd|wim|Z)'
|
||||
else
|
||||
if [[ ${words[1]} == d ]]; then
|
||||
local IFS=$'\n'
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package bash-completion-doc
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -23,7 +23,7 @@ Name: bash-completion-doc
|
||||
Version: 2.7
|
||||
Release: 0
|
||||
Summary: The Documentation of Programmable Completion for Bash
|
||||
License: GPL-2.0+
|
||||
License: GPL-2.0-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
Url: https://github.com/scop/bash-completion/
|
||||
Source0: https://github.com/scop/bash-completion/releases/download/%{version}/%{_name}-%{version}.tar.xz
|
||||
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 24 09:21:58 UTC 2018 - werner@suse.de
|
||||
|
||||
- Add patch bash-completion-2.7-unRAR-remove.patch that is due legal
|
||||
issue the unRAR part of 7z had been removed (boo#1077978, boo#1090515)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 3 15:30:09 CEST 2018 - kukuk@suse.de
|
||||
|
||||
- Use %license instead of %doc [bsc#1082318]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 18 15:29:04 CET 2017 - sbrabec@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package bash-completion
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,7 +25,7 @@ Name: bash-completion
|
||||
Version: 2.7
|
||||
Release: 0
|
||||
Summary: Programmable Completion for Bash
|
||||
License: GPL-2.0+
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Shells
|
||||
Url: https://github.com/scop/bash-completion/
|
||||
Source0: https://github.com/scop/bash-completion/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||
@ -52,6 +52,8 @@ Patch9: rm-completion-smart-boo958462.patch
|
||||
Patch10: backticks-bsc963140.patch
|
||||
# PATCH-FIX-SUSE boo#977336
|
||||
Patch11: sh-script-completion-boo977336.patch
|
||||
# PATCH-FIX-SUSE boo#1090515
|
||||
Patch12: bash-completion-2.7-unRAR-remove.patch
|
||||
%if %build_doc
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: libxslt-tools
|
||||
@ -105,6 +107,7 @@ package bash-completion.
|
||||
%patch9 -b .p9
|
||||
%patch10 -b .p10 -p1
|
||||
%patch11 -b .p11 -p0
|
||||
%patch12 -b .p12 -p0
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -159,7 +162,7 @@ install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{name}/README
|
||||
%if %build_core
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING
|
||||
%license COPYING
|
||||
%if %build_doc
|
||||
%exclude %{_defaultdocdir}/%{name}/AUTHORS
|
||||
%exclude %{_defaultdocdir}/%{name}/README
|
||||
|
Loading…
x
Reference in New Issue
Block a user