From 5c5233903035e64c323014588815e3442ba41aae Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Nov 07 2019 15:45:29 +0000
Subject: Update to 5.0.0.


https://github.com/fedora-infra/bodhi/releases/tag/5.0.0

---

diff --git a/bodhi.spec b/bodhi.spec
index acf6ba5..75bc554 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,18 +2,20 @@
 %global bashcomproot    %(dirname %{bashcompdir} 2>/dev/null)
 %{?python_enable_dependency_generator}
 
+#%%global commit 17779cf31a712c4142e8e95a408db73ca17cb778
+#%%global commit_short %(c=%{commit}; echo ${c:0:7})
+
 Name:           bodhi
-Version:        4.1.0
-Release:        3%{?dist}
+Version:        5.0.0
+Release:        1%{?dist}
+#Release:        0.beta.1.%{commit_short}%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
 Summary:        A modular framework that facilitates publishing software updates
 URL:            https://github.com/fedora-infra/bodhi
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-
-# https://github.com/fedora-infra/bodhi/pull/3423
-Patch0:         bodhi-tests-rawhide.patch
+#Source0:        %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz
 
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
@@ -21,6 +23,7 @@ BuildRequires: %{py3_dist alembic}
 BuildRequires: %{py3_dist arrow}
 BuildRequires: %{py3_dist backoff}
 BuildRequires: %{py3_dist bleach}
+BuildRequires: %{py3_dist celery}
 BuildRequires: %{py3_dist click}
 BuildRequires: %{py3_dist colander}
 BuildRequires: %{py3_dist cornice_sphinx} >= 0.3
@@ -183,6 +186,7 @@ updates for a software distribution.
 
 %prep
 %autosetup -p1 -n bodhi-%{version}
+#%%autosetup -p1 -n bodhi-%{commit}
 
 # Kill some dev deps
 sed -i '/pyramid_debugtoolbar/d' setup.py
@@ -195,6 +199,7 @@ mv devel/development.ini.example development.ini
 %build
 %py3_build
 
+export PYTHONPATH=`pwd`
 make %{?_smp_mflags} -C docs html
 make %{?_smp_mflags} -C docs man
 
@@ -211,6 +216,7 @@ make %{?_smp_mflags} -C docs man
 
 install -Dpm 0755 bodhi-complete.sh %{buildroot}%{bashcompdir}/%{name}
 install -m 644 apache/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+sed -i -s 's/BODHI_VERSION/%{version}/g' %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 install -m 640 production.ini %{buildroot}%{_sysconfdir}/%{name}/production.ini
 install -m 640 alembic.ini %{buildroot}%{_sysconfdir}/%{name}/alembic.ini
 install apache/%{name}.wsgi %{buildroot}%{_datadir}/%{name}/%{name}.wsgi
@@ -245,9 +251,9 @@ install -pm0644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 %files composer
 %license COPYING
 %doc README.rst
-%{python3_sitelib}/%{name}/server/consumers/composer.py
+%{python3_sitelib}/%{name}/server/tasks/composer.py
 # The __pycache__ folder itself is owned by bodhi-server.
-%{python3_sitelib}/%{name}/server/consumers/__pycache__/composer.*
+%{python3_sitelib}/%{name}/server/tasks/__pycache__/composer.*
 %{python3_sitelib}/%{name}/server/metadata.py
 %{python3_sitelib}/%{name}/server/__pycache__/metadata.*
 
@@ -304,13 +310,19 @@ install -pm0644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 %attr(-,bodhi,bodhi) %config(noreplace) %{_sysconfdir}/bodhi/*
 %attr(0775,bodhi,bodhi) %{_localstatedir}/cache/bodhi
 # These excluded files are in the bodhi-consumers package so don't include them here.
-%exclude %{python3_sitelib}/%{name}/server/consumers/composer.py
-%exclude %{python3_sitelib}/%{name}/server/consumers/__pycache__/composer.*
+%exclude %{python3_sitelib}/%{name}/server/tasks/composer.py
+%exclude %{python3_sitelib}/%{name}/server/tasks/__pycache__/composer.*
 %exclude %{python3_sitelib}/%{name}/server/metadata.py
 %exclude %{python3_sitelib}/%{name}/server/__pycache__/metadata.*
 
 
 %changelog
+* Thu Nov 07 2019 Aurelien Bompard <abompard@fedoraproject.org> - 5.0.0-1
+- Update to 5.0.0. https://github.com/fedora-infra/bodhi/releases/tag/5.0.0
+
+* Tue Aug 20 2019 Aurelien Bompard <abompard@fedoraproject.org> - 4.1.1-1
+- Update to 4.1.1. https://github.com/fedora-infra/bodhi/releases/tag/4.1.1
+
 * Thu Jul 25 2019 Aurelien Bompard <abompard@fedoraproject.org> - 4.1.0-3
 - Fix build on Rawhide
 
diff --git a/local-rpmbuild.sh b/local-rpmbuild.sh
new file mode 100644
index 0000000..95b4aa9
--- /dev/null
+++ b/local-rpmbuild.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+FEDORA=`git symbolic-ref --short HEAD | awk '/^f[0-9]+/ { print gensub("^f", "", 1)}'`
+
+old_fedora=$[${FEDORA} - 1]
+here="`pwd`"
+
+set -x
+
+rpmbuild \
+    --define "_sourcedir ${here}" --define "_specdir ${here}" --define "_builddir ${here}" --define "_srcrpmdir ${here}" --define "_rpmdir ${here}" \
+    --define "dist .fc${FEDORA}.infra" \
+    --define "fedora ${FEDORA}" \
+    --eval "%undefine rhel" \
+    --define "fc${FEDORA} 1" \
+    --eval "%undefine fc${old_fedora}" \
+    --nodeps -bs bodhi.spec
+
+set +x
+latest_srpm=`ls -rt1 bodhi-*.infra.src.rpm | tail -n 1`
+echo "Now build in Koji with:"
+echo "koji build f${FEDORA}-infra $latest_srpm"
diff --git a/sources b/sources
index 40633c0..73c6e83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bodhi-4.1.0.tar.gz) = c7127b68e6ac5788e224fa2a17d546b2203c5e3376a09d0cbb7dd458674282429c9a331b67444b32f59ff392f586e8ce333ffd9a776a857b85dd6a2721ba80dc
+SHA512 (bodhi-5.0.0.tar.gz) = 43a9afbeced3c1e8f21b2c705103d7e7674e1ec0a2068f5ecc04aa2bbba5918ae9922d6d529832329fb123133db57d2661ed05b312e24a179801003b19d7ac7d