automatic import of copr-backend

4 files changed, 19 insertions, 42 deletions

diff --git a/.gitignore b/.gitignore
index df7f743..faa92b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /copr-backend-1.165.tar.gz
 /test-data-copr-backend-2.tar.gz
+/copr-backend-1.168.tar.gz
diff --git a/copr-backend.spec b/copr-backend.spec
index 50ef523..e1f597f 100644
--- a/copr-backend.spec
+++ b/copr-backend.spec
@@ -9,7 +9,7 @@
 %global copr_common_version 0.16.4.dev
 
 Name:       copr-backend
-Version:    1.165
+Version:    1.168
 Release:    1%{?dist}
 Summary:    Backend for Copr
 
@@ -21,7 +21,6 @@ URL:        https://github.com/fedora-copr/copr
 # tito build --tgz --tag %%name-%%version-%%release
 Source0:    %{name}-%{version}.tar.gz
 Source1:    https://github.com/fedora-copr/%{tests_tar}/archive/v%{tests_version}/%{tests_tar}-%{tests_version}.tar.gz
-Patch0:     copr_messaging.patch  
 
 BuildArch:  noarch
 BuildRequires: asciidoc
@@ -42,10 +41,6 @@ BuildRequires: python3-copr-common >= %copr_common_version
 BuildRequires: python3-daemon
 BuildRequires: python3-dateutil
 BuildRequires: python3-distro
-%if !0%{?openEuler}
-BuildRequires: python3-fedmsg
-BuildRequires: python3-copr-messaging
-%endif
 BuildRequires: python3-filelock
 BuildRequires: python3-gobject
 BuildRequires: python3-httpretty
@@ -80,19 +75,17 @@ Requires:   openssh-clients
 Requires:   prunerepo >= %prunerepo_version
 Requires:   python3-copr
 Requires:   python3-copr-common >= %copr_common_version
+Recommends: python3-copr-messaging
 Requires:   python3-daemon
 Requires:   python3-dateutil
-%if !0%{?openEuler}
-Requires:   python3-fedmsg
-Requires:   python3-copr-messaging
-Requires:   python3-novaclient
-%endif
+Recommends: python3-fedmsg
 Requires:   python3-filelock
 Requires:   python3-gobject
 Requires:   python3-humanize
 Requires:   python3-jinja2
 Requires:   python3-munch
 Requires:   python3-netaddr
+Requires:   python3-novaclient
 Requires:   python3-packaging
 Requires:   python3-pytz
 Requires:   python3-requests
@@ -131,7 +124,6 @@ only.
 
 %prep
 %setup -q -a 1
-%patch -P0 -p2
 
 
 %build
@@ -188,7 +180,7 @@ cp -a conf/logstash/copr_backend.conf %{buildroot}%{_pkgdocdir}/examples/%{_sysc
 
 cp -a docs/build/html %{buildroot}%{_pkgdocdir}/
 
-# check need non-root user
+
 %check
 ./run_tests.sh -vv --no-cov
 
@@ -249,6 +241,18 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
 %exclude %{_pkgdocdir}/playbooks
 
 %changelog
+* Wed Apr 05 2023 Jiri Kyjovsky <j1.kyjovsky@gmail.com> 1.168-1
+- Bump version for release mess
+
+* Tue Apr 04 2023 Jiri Kyjovsky <j1.kyjovsky@gmail.com> 1.167-1
+- Run createrepo without --database
+- Make copr_messaging optional
+
+* Wed Mar 22 2023 Jiri Kyjovsky <j1.kyjovsky@gmail.com> 1.166-1
+- Don't include package name into srpm result dir name
+- Remove libmodulemd1 dependency
+- Hardlink RPMs while doing rawhide_to_release
+- Make sign key domain name configurable
 * Wed Jan 25 2023 Jakub Kadlcik <frostyx@email.cz> 1.165-1
 - Skip the test_run_prunerepo test because of Koji
 
diff --git a/copr_messaging.patch b/copr_messaging.patch
deleted file mode 100644
index 652ac52..0000000
--- a/copr_messaging.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/backend/copr_backend/msgbus.py b/backend/copr_backend/msgbus.py
-index 0c224ef1..d5352041 100644
---- a/backend/copr_backend/msgbus.py
-+++ b/backend/copr_backend/msgbus.py
-@@ -7,7 +7,13 @@ import logging
- import copy
- import json
- 
--from copr_messaging import schema
-+try:
-+    from copr_messaging import schema
-+except ImportError:
-+    # fedmsg is optional
-+    copr_messaging_enabled = False
-+else:
-+    copr_messaging_enabled = True
- 
- from .constants import BuildStatus
- 
-@@ -33,6 +39,8 @@ def message_from_worker_job(style, topic, job, who, ip, pid):
-     once we can exepect that people are using copr-messaging module (and thus
-     we can change message format without affecting the API).
-     """
-+    if not copr_messaging_enabled:
-+        return None
-     if style == 'v1':
-         content = {
-             'user': job.submitter,
diff --git a/sources b/sources
index be2c85d..704becb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-877c2ad43e7df5aa430e7f282c2b9650  copr-backend-1.165.tar.gz
+8dacd18f46475296d0199365db977649  copr-backend-1.168.tar.gz
 a35697a68640fb4c0bcfef02a93eac63  test-data-copr-backend-2.tar.gz