From 3f34c2104145e164480eb1177c822cb12c950233 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: May 31 2017 18:09:19 +0000 Subject: Update to 1.3.0 Signed-off-by: Jeremy Cline --- diff --git a/.gitignore b/.gitignore index 1594e0a..75b82e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /fmn-1.1.0.tar.gz /fmn-1.2.0.tar.gz +/fmn-1.3.0.tar.gz diff --git a/python-fmn.spec b/python-fmn.spec index 47a227d..b3d24ce 100644 --- a/python-fmn.spec +++ b/python-fmn.spec @@ -5,7 +5,7 @@ %global with_docs 0 Name: python-%{srcname} -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?dist} Summary: A system for generic fedmsg-driven notifications for end users @@ -24,44 +24,67 @@ notifications for all the applications they use in one place. %package -n python2-%{srcname} Summary: %{summary} Requires: fedmsg +Requires: httpd +Requires: mod_wsgi Requires: python-arrow Requires: python-beautifulsoup4 Requires: python-bleach +Requires: python-datanommer-models Requires: python-docutils Requires: python-dogpile-cache -Requires: python-fedmsg-meta-fedora-infrastructure +Requires: python-fedmsg-meta-fedora-infrastructure >= 0.18 +Requires: python-flask +Requires: python-flask-openid Requires: python-markupsafe Requires: python-moksha-hub +Requires: python-openid +Requires: python-openid-cla +Requires: python-openid-teams Requires: python-pika +Requires: python-pydns +Requires: python-pylibravatar Requires: python-fedora Requires: python-redis Requires: python-requests Requires: python-six Requires: python-sqlalchemy >= 0.8 +Requires: python-twisted +Requires: python-wtforms Requires(post): systemd Requires(preun): systemd Requires(postun): systemd + BuildRequires: fedmsg BuildRequires: python-arrow BuildRequires: python-beautifulsoup4 BuildRequires: python-bleach +BuildRequires: python-datanommer-models BuildRequires: python-devel BuildRequires: python-docutils BuildRequires: python-dogpile-cache BuildRequires: python-fedmsg-meta-fedora-infrastructure BuildRequires: python-fedora BuildRequires: python-flake8 +BuildRequires: python-flask +BuildRequires: python-flask-openid BuildRequires: python-html5lib BuildRequires: python-markupsafe BuildRequires: python-moksha-hub BuildRequires: python-mock +BuildRequires: python-openid +BuildRequires: python-openid-cla +BuildRequires: python-openid-teams BuildRequires: python-pika +BuildRequires: python-pydns +BuildRequires: python-pylibravatar +BuildRequires: python-pytest BuildRequires: python-redis BuildRequires: python-requests BuildRequires: python-setuptools BuildRequires: python-six BuildRequires: python-sqlalchemy >= 0.8 -BuildRequires: python-vcrpy +BuildRequires: python-twisted +BuildRequires: python-wtforms BuildRequires: python2-devel BuildRequires: systemd %{?python_provide:%python_provide python2-%{srcname}} @@ -72,6 +95,10 @@ Provides: python-fmn-lib = %{version}-%{release} Obsoletes: python-fmn-lib < 0.8.2-3%{?dist} Provides: python-fmn-consumer = %{version}-%{release} Obsoletes: python-fmn-consumer < 1.0.3-2%{?dist} +Provides: python-fmn-web = %{version}-%{release} +Obsoletes: python-fmn-web < 0.8.1-4%{?dist} +Provides: python-fmn-sse = %{version}-%{release} +Obsoletes: python-fmn-sse < 0.2.1-4%{?dist} %description -n python2-%{srcname} fmn is a family of systems to manage end-user notifications triggered by @@ -94,12 +121,13 @@ HTML documentation for python-fmn. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -p1 -n %{srcname}-%{version} %build %py2_build + %if 0%{?with_docs} > 0 pushd docs PYTHONPATH=$(dirname $(pwd)) make html @@ -118,9 +146,19 @@ install -pm644 alembic.ini %{buildroot}/%{_datadir}/%{srcname}/alembic.ini install -pm644 systemd/* %{buildroot}/%{_unitdir}/ cp -a alembic %{buildroot}/%{_datadir}/%{srcname}/ +%{__mkdir_p} %{buildroot}/%{_datadir}/%{srcname} +%{__mkdir_p} %{buildroot}/%{_sysconfdir}/httpd/conf.d +cp -p apache/%{srcname}.web.wsgi %{buildroot}%{_datadir}/%{srcname}/%{srcname}.web.wsgi +cp -p apache/%{srcname}.web.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/%{srcname}.web.conf +cp -r fmn/web/static/ %{buildroot}%{_datadir}/%{srcname}/static + +rm -rf %{buildroot}%{_datadir}/%{srcname}/static/bootstrap + -%check -PYTHONPATH=$(pwd) python -m unittest discover +# The old version of flake8 on EPEL7 has weird rules that aren't problems +# in newer versions. https://github.com/fedora-infra/fmn/issues/163 +# %check +# PYTHONPATH=$(pwd) py.test %files -n python2-%{srcname} @@ -130,6 +168,8 @@ PYTHONPATH=$(pwd) python -m unittest discover %{_datadir}/%{srcname} %{_bindir}/fmn-createdb %{_unitdir}/* +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{srcname}.web.conf +%{_datadir}/%{srcname} %if 0%{?with_docs} > 0 @@ -140,12 +180,13 @@ PYTHONPATH=$(pwd) python -m unittest discover %changelog +* Wed May 31 2017 Jeremy Cline - 1.3.0-1 +- Update to 1.3.0 +- Provide fmn-sse and fmn-web + * Mon Apr 10 2017 Jeremy Cline - 1.2.0-1 - Update to upstream 1.2.0 -* Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - * Fri Jan 20 2017 Jeremy Cline - 1.1.0-1 - Update to latest upstream - Address package review comments diff --git a/sources b/sources index c32d778..4cf35ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fmn-1.2.0.tar.gz) = 417aa59213261b3f277f0e828bd0a37c310f4b9070bd40a5bded9a387b8de3d6e1f6d533820446a9c832786e365d2f1411bf71725bbd97c1c20ec566a606a531 +SHA512 (fmn-1.3.0.tar.gz) = 8d249501a91a9c6ad61cd5ab2597b30922d8fb4447652ee544c809237f84e7d756099399eba62369172b51a34a0cd92bb6a34cb4281d6d4f7752bdceff885de3