From 0be96f144a0459f0c014b00e6c870ba66eecdd20 Mon Sep 17 00:00:00 2001 From: Eric Torres Date: Tue, 21 Dec 2021 00:23:53 -0800 Subject: [PATCH 1/2] Clean up PKGBUILD --- PKGBUILD | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a89ad18..8a0d930 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,21 +22,10 @@ package() { python setup.py build python setup.py --root="$pkgdir" install - ## Install /etc/config files - #install -dm755 "${pkgdir}/etc/helper-scripts" - #for config in config/*; do - # install -m644 "${config}" "${pkgdir}/etc/helper-scripts/${config##*/}" - #done - ## Install zsh completions - #for completion in zsh/completions/*; do + #for completion in zsh; do # install -m644 "${completion}" "${pkgdir}/usr/share/zsh/site-functions/${plugin##*.}" #done - - ## Install zsh plugins - #for plugin in zsh/plugins/*; do - # install -m644 "${plugin}" "${pkgdir}/usr/share/zsh/plugins/helper-scripts/${plugin##*/}" - #done } check() { From 19b6ea67269806ba8591ffee9e67e07f9cf395b2 Mon Sep 17 00:00:00 2001 From: Eric Torres Date: Tue, 21 Dec 2021 00:24:13 -0800 Subject: [PATCH 2/2] Fix broken specfile --- file-scripts.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/file-scripts.spec b/file-scripts.spec index 257261e..8acb092 100644 --- a/file-scripts.spec +++ b/file-scripts.spec @@ -23,8 +23,11 @@ Summary: Eric's helper scripts License: GPL-3.0-only Group: Productivity/File utilities Source: %{name}-%{version}.tar.gz +BuildRequires: python3 +BuildRequires: python3-setuptools +BuildRequires: python3-Sphinx Requires: %{_bindir}/python3 -Requires:: fd +Requires: fd Recommends: fzf Supplements: bash Supplements: zsh @@ -45,28 +48,26 @@ Plugins and completions for helper scripts. %setup -q %build +%{python3_build} %install -%{python_install} - -# Install zsh plugins -ZSHPLUGINDIR='%{buildroot}%{_datadir}/zsh/plugins/helper-scripts' -mkdir -p "${ZSHPLUGINDIR}" -cp zsh/plugins/* "${ZSHPLUGINDIR}" +%{python3_install} # Install zsh completion functions ZSHCOMPLETIONDIR="%{buildroot}%{_datadir}/zsh/site-functions" mkdir -p "${ZSHCOMPLETIONDIR}" -cp zsh/completions/* "${ZSHCOMPLETIONDIR}" - +for completion in zsh/*; do + install -Dm644 "${completion}" "${ZSHCOMPLETIONDIR}/${completion##*.}" +done %check +# %files %%{python_files} (bug) %files %attr(0755,-,-) %{_bindir}/* +/usr/lib/python3*/* %files zsh-plugins -%{_datadir}/zsh/plugins/helper-scripts/* %{_datadir}/zsh/site-functions/* %changelog