From c6f5ff90e56b4de5899921feb9e854c2ce5a4026 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Sep 23 2022 07:25:48 +0000
Subject: [PATCH 1/3] Remove support for rpmlint 1.X


---

diff --git a/roles/rpm-lint/tasks/main.yaml b/roles/rpm-lint/tasks/main.yaml
index f8f3752..ab61c6c 100644
--- a/roles/rpm-lint/tasks/main.yaml
+++ b/roles/rpm-lint/tasks/main.yaml
@@ -21,7 +21,6 @@
 
 - name: Show rpmlint version
   shell: rpmlint --version
-  register: version
 
 - name: Get rpmlintrc path
   shell: ls *.rpmlintrc
@@ -40,14 +39,7 @@
     path: "{{ zuul.project.src_dir }}/rpmlint.toml"
   register: toml
 
-- name: Run rpmlint 1.11
-  shell: rpmlint {% if rpmlintrc | default("") %} --file {{ rpmlintrc }} {% endif %} ./*.spec ./*.rpm
-  args:
-    chdir: "{{ zuul.project.src_dir }}"
-  when: version.stdout == "rpmlint version 1.11"
-
 - name: Run rpmlint 2.X
   shell: rpmlint {% if rpmlintrc | default("") %} -r {{ rpmlintrc }} {% endif %} {% if toml.stat.isreg | default(false) %} -c rpmlint.toml {% endif %} ./*.spec ./*.rpm
   args:
     chdir: "{{ zuul.project.src_dir }}"
-  when: version.stdout != "rpmlint version 1.11"

From e553cab665803862bf3a2f96b224bb0001d90ff5 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Sep 23 2022 07:26:31 +0000
Subject: [PATCH 2/3] Add rpmlint-fedora-license-data as dependent packages


As requested by https://pagure.io/fedora-ci/general/issue/368

---

diff --git a/roles/rpm-lint/tasks/main.yaml b/roles/rpm-lint/tasks/main.yaml
index ab61c6c..473ad94 100644
--- a/roles/rpm-lint/tasks/main.yaml
+++ b/roles/rpm-lint/tasks/main.yaml
@@ -4,6 +4,7 @@
     name:
       - rpmlint
       - desktop-file-utils
+      - rpmlint-fedora-license-data
     state: latest
   become: true
 

From 8a9f04d627ecc973542afb29e683c5699ee8986f Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Sep 23 2022 07:36:30 +0000
Subject: [PATCH 3/3] Bump test job for rpm-lint to f36 image


---

diff --git a/zuul-extra.d/jobs.yaml b/zuul-extra.d/jobs.yaml
index dea11a8..5ba4dd5 100644
--- a/zuul-extra.d/jobs.yaml
+++ b/zuul-extra.d/jobs.yaml
@@ -12,4 +12,4 @@
     nodeset:
       nodes:
         - name: fedora-node
-          label: cloud-fedora-34-small
+          label: cloud-fedora-36-small