diff --git a/.gitignore b/.gitignore index dee977e..f4be60c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dockerfile-parse-0.0.10.tar.gz /dockerfile-parse-0.0.11.tar.gz /dockerfile-parse-0.0.13.tar.gz +/1.0.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..a68cdb4 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,20 @@ +# https://packit.dev/docs/configuration/ + +# name of downstream (Fedora) RPM package +downstream_package_name: python-dockerfile-parse + +# for packit service (Github app) +jobs: +- job: sync_from_downstream + trigger: commit +- job: propose_downstream + trigger: release + metadata: + dist-git-branch: fedora-all +- job: copr_build + trigger: pull_request + metadata: + targets: + - fedora-all + - epel-7-x86_64 + - epel-8-x86_64 diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..cd89c9c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.12.1.dev8+g9d9c9e7. diff --git a/python-dockerfile-parse.spec b/python-dockerfile-parse.spec index 7a1c60d..43e7f3c 100644 --- a/python-dockerfile-parse.spec +++ b/python-dockerfile-parse.spec @@ -1,14 +1,10 @@ %if 0%{?rhel} && 0%{?rhel} <= 7 %bcond_with python3 -%if 0%{?rhel} <= 6 -%{!?python2_version: %global python2_version %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3])")} -%{!?_licensedir:%global license %%doc} -%endif %else %bcond_without python3 %endif -%if 0%{?fedora} && 0%{?fedora} >= 30 +%if (0%{?fedora} && 0%{?fedora} >= 30) || (0%{?rhel} && 0%{?rhel} >= 8) %bcond_with python2 %else %bcond_without python2 @@ -20,13 +16,13 @@ %global modname %(n=%{srcname}; echo ${n//-/_}) Name: python-%{srcname} -Version: 0.0.13 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Python library for Dockerfile manipulation License: BSD -URL: https://github.com/DBuildService/dockerfile-parse -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +URL: https://github.com/containerbuildsystem/dockerfile-parse +Source0: https://github.com/containerbuildsystem/dockerfile-parse/archive/%{version}.tar.gz BuildArch: noarch @@ -38,15 +34,17 @@ BuildArch: noarch Summary: %{summary} %{?python_provide:%python_provide python2-%{srcname}} BuildRequires: python2-devel -BuildRequires: python2-six %if 0%{?rhel} && 0%{?rhel} <= 7 +BuildRequires: python-six BuildRequires: python-setuptools BuildRequires: pytest +Requires: python-six %else +BuildRequires: python2-six BuildRequires: python2-setuptools BuildRequires: python2-pytest -%endif Requires: python2-six +%endif %description -n python2-%{srcname} %{summary}. @@ -73,7 +71,7 @@ Python 3 version. %endif #python3 pkg %prep -%setup -q -n %{srcname}-%{version} +%setup -q %build @@ -120,6 +118,9 @@ py.test-%{python3_version} -v tests %endif %changelog +* Fri Jul 03 2020 Packit Service - 1.0.0-1 +- new upstream release: 1.0.0 + * Thu Jan 30 2020 Fedora Release Engineering - 0.0.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 85ff388..a8dbb57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dockerfile-parse-0.0.13.tar.gz) = d3039e8f57829e8f3488b2f51bd3a21afd9684b5a6063ffce781226541c98a585bbaa6cb574ae9b9925b1fe332b47e26d27dfab0f6aa3472630a9bd183e8c31d +SHA512 (1.0.0.tar.gz) = 65f9c5a47655e0f6cf6cf50aa97827bbeb6d10eae8e84596c9be6c0e7921a57b6e25cf5353b6c11480f1520fb5892702a382b5abe9f50bbff3d32642950df948