| |
@@ -4,7 +4,7 @@
|
| |
|
| |
Name: rpkg
|
| |
Version: 1.56
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
|
| |
Summary: Python library for interacting with rpm+git
|
| |
License: GPLv2+ and LGPLv2
|
| |
@@ -22,6 +22,8 @@
|
| |
# and there is only old rpm-python package in EL6 and 7, so just simply to
|
| |
# remove rpm-py-installer for now.
|
| |
Patch0: remove-koji-and-rpm-py-installer-from-requires.patch
|
| |
+ # https://pagure.io/rpkg/pull-request/361
|
| |
+ Patch1: add-flatpak-build.patch
|
| |
|
| |
%if 0%{?fedora} || 0%{?rhel} > 7
|
| |
# Enable python3 build by default
|
| |
@@ -52,6 +54,7 @@
|
| |
BuildRequires: python2-koji >= 1.15
|
| |
BuildRequires: python2-cccolutils
|
| |
BuildRequires: python2-openidc-client
|
| |
+ BuildRequires: PyYAML
|
| |
|
| |
%if 0%{?rhel}
|
| |
BuildRequires: GitPython
|
| |
@@ -60,11 +63,16 @@
|
| |
BuildRequires: python-six >= 1.9.0
|
| |
%else
|
| |
BuildRequires: python2-GitPython
|
| |
+ BuildRequires: python2-gobject-base
|
| |
BuildRequires: python2-pycurl
|
| |
BuildRequires: python2-requests
|
| |
BuildRequires: python2-six >= 1.9.0
|
| |
%endif
|
| |
|
| |
+ %if 0%{?rhel} && 0%{?rhel} == 7
|
| |
+ BuildRequires: python-gobject-base
|
| |
+ %endif
|
| |
+
|
| |
%if 0%{?rhel} && 0%{?rhel} < 7
|
| |
BuildRequires: python-argparse
|
| |
BuildRequires: python-mock
|
| |
@@ -75,6 +83,7 @@
|
| |
BuildRequires: python2-mock
|
| |
BuildRequires: python2-nose
|
| |
BuildRequires: python2-setuptools
|
| |
+ BuildRequires: libmodulemd
|
| |
%endif
|
| |
|
| |
BuildRequires: rpmlint
|
| |
@@ -86,6 +95,7 @@
|
| |
|
| |
Requires: python2-cccolutils
|
| |
Requires: python2-koji >= 1.15
|
| |
+ Requires: PyYAML
|
| |
|
| |
%if 0%{?rhel}
|
| |
Requires: GitPython >= 0.2.0
|
| |
@@ -98,10 +108,18 @@
|
| |
Requires: python2-rpm
|
| |
Requires: python2-pycurl
|
| |
Requires: python2-six >= 1.9.0
|
| |
+ Requires: python2-gobject-base
|
| |
+
|
| |
+ Requires: libmodulemd
|
| |
%endif
|
| |
|
| |
%if 0%{?rhel} && 0%{?rhel} < 7
|
| |
- Requires: python-argparse
|
| |
+ Requires: python-argparse
|
| |
+ %endif
|
| |
+
|
| |
+ %if 0%{?rhel} && 0%{?rhel} == 7
|
| |
+ Requires: python-gobject-base
|
| |
+ Requires: libmodulemd
|
| |
%endif
|
| |
|
| |
Requires: %{name}-common = %{version}-%{release}
|
| |
@@ -135,6 +153,8 @@
|
| |
BuildRequires: python3-requests
|
| |
BuildRequires: python3-setuptools
|
| |
BuildRequires: python3-nose
|
| |
+ BuildRequires: python3-gobject-base
|
| |
+ BuildRequires: python3-PyYAML
|
| |
|
| |
BuildRequires: rpmlint
|
| |
|
| |
@@ -149,6 +169,9 @@
|
| |
Requires: python3-rpm
|
| |
Requires: python3-pycurl
|
| |
Requires: python3-six >= 1.9.0
|
| |
+ Requires: python3-gobject-base
|
| |
+ Requires: python3-PyYAML
|
| |
+ Requires: libmodulemd
|
| |
|
| |
Requires: %{name}-common = %{version}-%{release}
|
| |
|
| |
@@ -173,6 +196,7 @@
|
| |
%prep
|
| |
%setup -q
|
| |
%patch0 -p1
|
| |
+ %patch1 -p1
|
| |
|
| |
|
| |
%build
|
| |
@@ -246,6 +270,10 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Fri Sep 7 2018 Owen Taylor <otaylor@redhat.com> - 1.56-2
|
| |
+ - Add patch from upstream pull-request to add a flatpak-build subcommand
|
| |
+ - Add PyYAML dependencies so that the spec file at least builds on epel6/epel7
|
| |
+
|
| |
* Tue Aug 21 2018 Chenxiong Qi <cqi@redhat.com> - 1.56-1
|
| |
- Validate greenwave policy early in Commands.build (cqi)
|
| |
- Refine error message for failure gating.yaml validation (cqi)
|
| |
See https://pagure.io/rpkg/pull-request/361
This also adds PyYAML dependencies - without this, the spec file didn't
work on EPEL6/EPEL7 and it was hard to test the conditionalization.
Now that upstream flatpak-build PR is agreed upon, here's a patch to add it to Fedora packaging.
I think I have the conditionals right for el targets.
EPEL7 scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=29524820
EPEL6 scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=29524884