From d683e7260e4fab2318e2c92b95e6b64b9dec049a Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 27 2018 08:05:33 +0000 Subject: Drop obsolete scripts, switch over to python 3 --- diff --git a/fedora-packager.spec b/fedora-packager.spec index 772328e..2044deb 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,29 +4,24 @@ Name: fedora-packager Version: 0.6.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for setting up a fedora maintainer environment -Group: Applications/Productivity License: GPLv2+ URL: https://pagure.io/fedora-packager Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2 -BuildRequires: python2-devel +BuildRequires: python3-devel Requires: koji >= 1.11.0 Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint Requires: mock curl openssh-clients -Requires: python2-pyOpenSSL -Requires: python2-offtrac # For fedora-burn-yubikey.py -Requires: python2-yubico +Requires: python3-yubico Requires: redhat-rpm-config Requires: fedpkg >= 1.0 -Requires: fedora-cert = %{version}-%{release} -# Could be Recommends: it is not a hard dependency anymore since python-yubico -# is now used -Requires: ykpers +Obsoletes: fedora-cert < 0.6.0.3-4 +Recommends: ykpers # This is the version in which SNI was fixed %if 0%{?fedora} Requires: krb5-workstation >= 1.14.3-4 @@ -46,51 +41,44 @@ BuildArch: noarch Set of utilities useful for a fedora packager in setting up their environment. -%package -n fedora-cert -Summary: Fedora certificate tool and python library -Group: Applications/Databases -Requires: python2-pyOpenSSL -Requires: python2-fedora -Requires: python2-pycurl -%if 0%{?rhel} == 5 || 0%{?rhel} == 4 -Requires: python-kitchen -%endif - -%description -n fedora-cert -Provides fedora-cert and the fedora_cert python library - - %prep %setup -q %build -%configure -make %{?_smp_mflags} +%configure PYTHON=%{__python3} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_libexecdir} - - +%make_install +sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %files %license COPYING %doc TODO AUTHORS ChangeLog %{_bindir}/* %{_sbindir}/* -%config(noreplace) %{_sysconfdir}/koji.conf.d/* -%config(noreplace) %{_sysconfdir}/krb5.conf.d/* +%exclude %{_bindir}/fedora-hosted +%exclude %{_bindir}/fedora-packager-setup +%exclude %{_bindir}/fedoradev-pkgowners %exclude %{_bindir}/fedora-cert +%exclude %{python3_sitelib}/fedora_cert -%files -n fedora-cert -%license COPYING -%doc TODO AUTHORS ChangeLog -%{_bindir}/fedora-cert -%{python2_sitelib}/fedora_cert - +%config(noreplace) %{_sysconfdir}/koji.conf.d/* +%config(noreplace) %{_sysconfdir}/krb5.conf.d/* %changelog +* Tue Nov 27 2018 Zbigniew Jędrzejewski-Szmek - 0.6.0.2-4 +- Drop obsolete scripts, switch over to python 3 (#1024796) + * fedora-burn-yubikey is python3 compatible + Those old scripts have been removed: + * fedora-hosted is for fedorahosted.org, which doesn't exist anymore + * fedora-packager-setup and fedora-cert download certificates, which + have been replaced by kerberos authentication + * fedoradev-pkgowners talks to pkgdb, which is no more + The fedora-cert python2 package is also removed. + The other scripts are most likely obsolete too, but they are just bash + wrappers around other tools, so they are still packaged. + * Tue Jul 31 2018 Miro Hrončok - 0.6.0.2-3 - Do not require packagedb-cli, it's not used anymore (#1024838)