| |
@@ -3,84 +3,90 @@
|
| |
%endif
|
| |
|
| |
Name: fedora-packager
|
| |
- Version: 0.6.0.2
|
| |
+ Version: 0.6.0.4
|
| |
Release: 1%{?dist}
|
| |
Summary: Tools for setting up a fedora maintainer environment
|
| |
|
| |
- Group: Applications/Productivity
|
| |
License: GPLv2+
|
| |
- URL: https://fedorahosted.org/fedora-packager
|
| |
- Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2
|
| |
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
| |
+ URL: https://pagure.io/fedora-packager
|
| |
+ Source0: https://releases.pagure.org/fedora-packager/fedora-packager-%{version}.tar.bz2
|
| |
|
| |
- BuildRequires: python-devel
|
| |
- Requires: koji bodhi-client
|
| |
+ BuildRequires: python3-devel
|
| |
+ BuildRequires: make
|
| |
+ Requires: koji >= 1.11.0
|
| |
+ Requires: bodhi-client
|
| |
Requires: rpm-build rpmdevtools rpmlint
|
| |
Requires: mock curl openssh-clients
|
| |
- Requires: pyOpenSSL
|
| |
Requires: redhat-rpm-config
|
| |
Requires: fedpkg >= 1.0
|
| |
- Requires: fedora-cert = %{version}-%{release}
|
| |
- Requires: python-yubico
|
| |
+ Obsoletes: fedora-cert < 0.6.0.3-4
|
| |
# This is the version in which SNI was fixed
|
| |
+ %if 0%{?fedora}
|
| |
Requires: krb5-workstation >= 1.14.3-4
|
| |
+ %else
|
| |
+ %if 0%{?rhel} >= 7
|
| |
+ Requires: krb5-workstation >= 1.14.1-24
|
| |
+ %else
|
| |
+ # older rhels wont fully work without configuration, but lets make sure they have krb
|
| |
+ # we should be able to assume newer RHELs's will have a new enough version
|
| |
+ Requires: krb5-workstation
|
| |
+ %endif
|
| |
+ %endif
|
| |
+ Recommends: fedora-packager-yubikey
|
| |
|
| |
BuildArch: noarch
|
| |
|
| |
%description
|
| |
Set of utilities useful for a fedora packager in setting up their environment.
|
| |
|
| |
+ %package yubikey
|
| |
+ Summary: tool for setting up a yubikey for use in Fedora
|
| |
+ # For fedora-burn-yubikey.py
|
| |
+ Requires: python3-yubico
|
| |
+ Recommends: ykpers
|
| |
|
| |
- %package -n fedora-cert
|
| |
- Summary: Fedora certificate tool and python library
|
| |
- Group: Applications/Databases
|
| |
- Requires: pyOpenSSL
|
| |
- Requires: python-requests
|
| |
- Requires: python-fedora
|
| |
- Requires: python-six
|
| |
- %if 0%{?rhel} == 5 || 0%{?rhel} == 4
|
| |
- Requires: python-kitchen
|
| |
- %endif
|
| |
-
|
| |
- %description -n fedora-cert
|
| |
- Provides fedora-cert and the fedora_cert python library
|
| |
+ BuildArch: noarch
|
| |
|
| |
+ %description yubikey
|
| |
+ A tool for setting up a yubikey for use in fedora
|
| |
|
| |
%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}
|
| |
-
|
| |
-
|
| |
- %clean
|
| |
- rm -rf $RPM_BUILD_ROOT
|
| |
-
|
| |
+ %make_install
|
| |
+ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/*
|
| |
|
| |
%files
|
| |
- %defattr(-,root,root,-)
|
| |
- %doc COPYING TODO AUTHORS ChangeLog
|
| |
+ %license COPYING
|
| |
+ %doc TODO AUTHORS ChangeLog
|
| |
%{_bindir}/*
|
| |
- %{_sbindir}/*
|
| |
- %dir %{_sysconfdir}/koji
|
| |
- %config(noreplace) %{_sysconfdir}/koji/*
|
| |
- %config %{_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
|
| |
- %defattr(-,root,root,-)
|
| |
- %doc COPYING TODO AUTHORS ChangeLog
|
| |
- %{_bindir}/fedora-cert
|
| |
- %{python_sitelib}/fedora_cert
|
| |
+ %config(noreplace) %{_sysconfdir}/koji.conf.d/*
|
| |
+ %config(noreplace) %{_sysconfdir}/krb5.conf.d/*
|
| |
|
| |
+ %files yubikey
|
| |
+ %license COPYING
|
| |
+ %{_sbindir}/*
|
| |
|
| |
%changelog
|
| |
+ * Tue Mar 31 2020 Mohan Boddu <mboddu@bhujji.com> - 0.6.0.4-1
|
| |
+ - Option for the mode_yubikey_otp must be bytes and not string. (cverna)
|
| |
+
|
| |
+ * Tue Mar 31 2020 Mohan Boddu <mboddu@bhujji.com> - 0.6.0.3-1
|
| |
+ - Remove obsolete fedora-packager-setup (tmz)
|
| |
+ - Drop mercurial formatting from .gitignore (tmz)
|
| |
+ - Fix for rhbz #1412260 (sergio)
|
| |
+
|
| |
* Sun Apr 01 2018 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.6.0.2-1
|
| |
- Make fedora-cert complain about certs no longer being used (puiterwijk)
|
| |
- Fix file opening for py3 (lbalhar)
|
| |
@@ -357,4 +363,4 @@
|
| |
- update to 0.1.1 fixes typo in fedora-cvs
|
| |
|
| |
* Sun Nov 11 2007 Dennis Gilmore <dennis@ausil.us> - 0.1-1
|
| |
- - initial build
|
| |
+ - initial build
|
| |
\ No newline at end of file
|
| |
ryanlerch
commented 3 years ago
Updates the version in configure.ac to current released version, and
updates the specfile to similar to what is currently used in fp.o
Signed-off-by: Ryan Lerch rlerch@redhat.com