Attachment 14370 Details for Bug 32836 – patch to fix bash completion

[patch] patch to fix bash completion

less_spec.patch (text/plain), 2.04 KB, created by Aurelian R on 2024-02-12 16:59:23 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-02-12 16:59:23 CET

Size: 2.04 KB

patch

obsolete

>--- less/SPECS/less.spec	2024-02-12 14:45:51.179776119 +0200
>+++ SPECS/less.spec	2024-02-12 17:17:18.953071947 +0200
>@@ -17,6 +17,7 @@ Patch3:		less-382-fixline.patch
> BuildRequires:	pkgconfig(ncursesw)
> BuildRequires:	pkgconfig(bash-completion)
> BuildRequires:	groff-for-man
>+BuildRequires:	bash, zsh
> # lesspipe.sh requires file
> Requires:	file
> Recommends:	html2text
>@@ -32,13 +33,13 @@ You should install less because it is a
> files, and you'll use it frequently.
> 
> %prep
>-%setup -q -a 2
>-%patch0 -p1
>-%patch2 -p1
>-%patch3 -p1 -b .fixline
>+%autosetup -p1 -a 2
> 
> chmod a+r lesspipe-%less_p_vers/*
> cp -a lesspipe-%less_p_vers/README.md README.md.lesspipe
>+# Fix bash-completion directory
>+sed -i 's|opt_prefix/share/bash-completion|opt_prefix/share/bash-completion.d/completions|g' \
>+       lesspipe-%less_p_vers/configure
> 
> %build
> CFLAGS=$(echo "%{optflags} -DHAVE_LOCALE" | sed -e s/-fomit-frame-pointer//)
>@@ -47,7 +48,7 @@ autoreconf -vfi
> %__make -f Makefile.aut distfiles
> %make_build
> cd lesspipe-%less_p_vers
>-./configure --prefix=%{_bindir}
>+./configure --prefix=%{_prefix}
> cd ..
> 
> %install
>@@ -55,12 +56,9 @@ cd ..
> # faq
> install -m 644 %{SOURCE1} .
> cd lesspipe-%less_p_vers
>-%make_install PREFIX=%{_prefix}
>-%__mkdir_p %{buildroot}%{_sysconfdir}/bash_completion.d
>-%__mkdir_p %{buildroot}%{_datadir}/zsh/site-functions
>-%__cp less_completion %{buildroot}%{_sysconfdir}/bash_completion.d/less_completion
>-%__cp _less %{buildroot}%{_datadir}/zsh/site-functions/
>+%make_install
> cd ..
>+
> mkdir -p %buildroot%_sysconfdir/profile.d/
> cat << EOF > %buildroot%_sysconfdir/profile.d/20less.sh
> CHARSET=\$(locale charmap 2> /dev/null)
>@@ -104,8 +102,6 @@ less will open html files with lynx, the
> none of the previous were found.
> EOF
> 
>-install -m644 lessecho.1 %{buildroot}%{_mandir}/man1
>-
> %if 0
> %check
> cd lesspipe-%less_p_vers
>@@ -121,5 +117,5 @@ make test
> %{_bindir}/*
> %{_mandir}/man1/*
> %{_sysconfdir}/profile.d/*
>-%{_sysconfdir}/bash_completion.d/less_completion
>+%{_datadir}/bash-completion.d/completions/less_completion
> %{_datadir}/zsh/site-functions/_less

--- less/SPECS/less.spec	2024-02-12 14:45:51.179776119 +0200
+++ SPECS/less.spec	2024-02-12 17:17:18.953071947 +0200
@@ -17,6 +17,7 @@ Patch3:		less-382-fixline.patch
 BuildRequires:	pkgconfig(ncursesw)
 BuildRequires:	pkgconfig(bash-completion)
 BuildRequires:	groff-for-man
+BuildRequires:	bash, zsh
 # lesspipe.sh requires file
 Requires:	file
 Recommends:	html2text
@@ -32,13 +33,13 @@ You should install less because it is a
 files, and you'll use it frequently.
 
 %prep
-%setup -q -a 2
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1 -b .fixline
+%autosetup -p1 -a 2
 
 chmod a+r lesspipe-%less_p_vers/*
 cp -a lesspipe-%less_p_vers/README.md README.md.lesspipe
+# Fix bash-completion directory
+sed -i 's|opt_prefix/share/bash-completion|opt_prefix/share/bash-completion.d/completions|g' \
+       lesspipe-%less_p_vers/configure
 
 %build
 CFLAGS=$(echo "%{optflags} -DHAVE_LOCALE" | sed -e s/-fomit-frame-pointer//)
@@ -47,7 +48,7 @@ autoreconf -vfi
 %__make -f Makefile.aut distfiles
 %make_build
 cd lesspipe-%less_p_vers
-./configure --prefix=%{_bindir}
+./configure --prefix=%{_prefix}
 cd ..
 
 %install
@@ -55,12 +56,9 @@ cd ..
 # faq
 install -m 644 %{SOURCE1} .
 cd lesspipe-%less_p_vers
-%make_install PREFIX=%{_prefix}
-%__mkdir_p %{buildroot}%{_sysconfdir}/bash_completion.d
-%__mkdir_p %{buildroot}%{_datadir}/zsh/site-functions
-%__cp less_completion %{buildroot}%{_sysconfdir}/bash_completion.d/less_completion
-%__cp _less %{buildroot}%{_datadir}/zsh/site-functions/
+%make_install
 cd ..
+
 mkdir -p %buildroot%_sysconfdir/profile.d/
 cat << EOF > %buildroot%_sysconfdir/profile.d/20less.sh
 CHARSET=\$(locale charmap 2> /dev/null)
@@ -104,8 +102,6 @@ less will open html files with lynx, the
 none of the previous were found.
 EOF
 
-install -m644 lessecho.1 %{buildroot}%{_mandir}/man1
-
 %if 0
 %check
 cd lesspipe-%less_p_vers
@@ -121,5 +117,5 @@ make test
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_sysconfdir}/profile.d/*
-%{_sysconfdir}/bash_completion.d/less_completion
+%{_datadir}/bash-completion.d/completions/less_completion
 %{_datadir}/zsh/site-functions/_less

Actions: View | Diff

Attachments on bug 32836: 14370 | 14371 | 14372