From 958929339d7708e66f4ba39f6444c6acc41c26a9 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sep 06 2018 02:55:54 +0000 Subject: Fixed rpmlint errors, added filter --- diff --git a/cinch.rpmlint b/cinch.rpmlint new file mode 100644 index 0000000..48c3f8c --- /dev/null +++ b/cinch.rpmlint @@ -0,0 +1 @@ +addFilter("zero-length.*jenkins_pinned") diff --git a/cinch.spec b/cinch.spec index 6064ee2..2c9013b 100644 --- a/cinch.spec +++ b/cinch.spec @@ -1,6 +1,6 @@ Name: cinch Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for provisioning Jenkins components for CI License: GPLv3+ @@ -8,12 +8,12 @@ URL: http://github.com/RedHatQE/cinch Source0: http://github.com/RedHatQE/%{name}/archive/v%{version}.tar.gz BuildRequires: ansible -BuildRequires: python3-plumbum -BuildRequires: python3-devel +BuildRequires: python3-plumbum +BuildRequires: python3-devel Requires: ansible -Requires: python3-plumbum +Requires: python3-plumbum -BuildArch: noarch +BuildArch: noarch %description Cinch is an Ansible-based tool for configuring Jenkins systems to enhance @@ -23,6 +23,7 @@ the Continuous Integration experience. %prep %autosetup -n %{name}-%{version} +find . -name '*.sh' -exec chmod +x '{}' \; %build %py3_build @@ -33,6 +34,10 @@ the Continuous Integration experience. # This is improperly installed by pip rm -rf %{buildroot}%{python3_sitelib}/tests +for f in $(find "%{buildroot}" -name '*.py'); do + sed -e '1s#/usr/bin/env python#%{__python3}#' -i "${f}" + chmod +x "${f}" +done %files @@ -45,6 +50,9 @@ rm -rf %{buildroot}%{python3_sitelib}/tests %changelog +* Wed Sep 05 2018 Greg Hellings - 1.1.0-2 +- Fixed up spec file for RPM lint errors + * Tue Aug 28 2018 Greg Hellings - 1.1.0-1 - New upstream version 1.1.0 - Fedora Ansible is now Python3