From 517dd3cbcebef648740093c665525a90dc89da9e Mon Sep 17 00:00:00 2001 From: Eric Torres Date: Mon, 20 Dec 2021 22:44:22 -0800 Subject: [PATCH] Update packaging information --- PKGBUILD | 13 +++++++------ file-scripts.spec | 11 +++-------- setup.py | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index cce1414..a89ad18 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Eric Torres pkgname=file-scripts -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=0 pkgdesc="Various scripts for performing file-related operations such as editing and deleting." arch=(any) @@ -19,11 +19,8 @@ pkgver() { package() { cd "${srcdir}/${pkgname}" - install -dm755 "${pkgdir}"/usr/{bin,share/zsh/{plugins/helper-scripts,site-functions}} - - for script in *.{py,sh}; do - install -m755 "${script}" "${pkgdir}/usr/bin/${script%.*}" - done + python setup.py build + python setup.py --root="$pkgdir" install ## Install /etc/config files #install -dm755 "${pkgdir}/etc/helper-scripts" @@ -41,3 +38,7 @@ package() { # install -m644 "${plugin}" "${pkgdir}/usr/share/zsh/plugins/helper-scripts/${plugin##*/}" #done } + +check() { + pytest +} diff --git a/file-scripts.spec b/file-scripts.spec index 860b207..257261e 100644 --- a/file-scripts.spec +++ b/file-scripts.spec @@ -1,7 +1,7 @@ # # spec file for package file-scripts # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: file-scripts -Version: 0.9 +Version: 0.9.1 Release: 0 Summary: Eric's helper scripts License: GPL-3.0-only @@ -47,12 +47,7 @@ Plugins and completions for helper scripts. %build %install -# Install scripts in /usr/bin first -SCRIPTDIR='%{buildroot}%{_bindir}' - -for script in *.{py,sh}; do - install -Dm755 "${script}" "${SCRIPTDIR}/${script%.*}" -done +%{python_install} # Install zsh plugins ZSHPLUGINDIR='%{buildroot}%{_datadir}/zsh/plugins/helper-scripts' diff --git a/setup.py b/setup.py index e688326..935914a 100644 --- a/setup.py +++ b/setup.py @@ -21,12 +21,12 @@ setuptools.setup( description="File-related helper scripts", long_description=long_description, long_description_content_type="text/markdown", - url="https://gitlab.com/pypa/sampleproject", + url="https://github.com/etorres4/file-scripts", packages=PACKAGES, scripts=SCRIPTS, classifiers=[ "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", + "License :: OSI Approved :: GNU GPLv3 License", "Operating System :: OS Independent", ], command_options={