From b7aedcc321a79ef00243e5bbf751b54695192d35 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 26 2016 13:53:09 +0000 Subject: Update to 2.10.1 --- diff --git a/pagure.spec b/pagure.spec index dfeb38f..3de9295 100644 --- a/pagure.spec +++ b/pagure.spec @@ -1,86 +1,86 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from %distutils.sysconfig import get_python_lib; print (get_python_lib())")} -Name: pagure -Version: 2.3.4 -Release: 1%{?dist} -Summary: A git-centered forge - -License: GPLv2+ -URL: https://pagure.io/pagure -Source0: https://pagure.io/releases/pagure/%{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python-nose - -BuildRequires: py-bcrypt -BuildRequires: python-alembic -BuildRequires: python-arrow -BuildRequires: python-binaryornot -BuildRequires: python-bleach -BuildRequires: python-blinker -BuildRequires: python-chardet -BuildRequires: python-cryptography -BuildRequires: python-docutils -BuildRequires: python-flask -BuildRequires: python-flask-wtf -BuildRequires: python-flask-multistatic -BuildRequires: python-markdown -BuildRequires: python-psutil -BuildRequires: python-pygit2 >= 0.20.1 -BuildRequires: python-pygments -BuildRequires: python-fedora -BuildRequires: python-openid -BuildRequires: python-openid-cla -BuildRequires: python-openid-teams -BuildRequires: python-straight-plugin -BuildRequires: python-wtforms -BuildRequires: python-munch -BuildRequires: python-enum34 -BuildRequires: python-redis +Name: pagure +Version: 2.10.1 +Release: 1%{?dist} +Summary: A git-centered forge + +License: GPLv2+ +URL: https://pagure.io/pagure +Source0: https://pagure.io/releases/pagure/%{name}-%{version}.tar.gz + +BuildArch: noarch + +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: python-nose + +BuildRequires: py-bcrypt +BuildRequires: python-alembic +BuildRequires: python-arrow +BuildRequires: python-binaryornot +BuildRequires: python-bleach +BuildRequires: python-blinker +BuildRequires: python-chardet +BuildRequires: python-cryptography +BuildRequires: python-docutils +BuildRequires: python-flask +BuildRequires: python-flask-wtf +BuildRequires: python-flask-multistatic +BuildRequires: python-markdown +BuildRequires: python-psutil +BuildRequires: python-pygit2 >= 0.20.1 +BuildRequires: python-pygments +BuildRequires: python-fedora +BuildRequires: python-openid +BuildRequires: python-openid-cla +BuildRequires: python-openid-teams +BuildRequires: python-straight-plugin +BuildRequires: python-wtforms +BuildRequires: python-munch +BuildRequires: python-enum34 +BuildRequires: python-redis # EPEL6 %if ( 0%{?rhel} && 0%{?rhel} == 6 ) -BuildRequires: python-sqlalchemy0.8 -Requires: python-sqlalchemy0.8 +BuildRequires: python-sqlalchemy0.8 +Requires: python-sqlalchemy0.8 %else -BuildRequires: python-sqlalchemy > 0.8 -Requires: python-sqlalchemy > 0.8 -BuildRequires: systemd +BuildRequires: python-sqlalchemy > 0.8 +Requires: python-sqlalchemy > 0.8 +BuildRequires: systemd %endif -Requires: py-bcrypt -Requires: python-alembic -Requires: python-arrow -Requires: python-binaryornot -Requires: python-bleach -Requires: python-blinker -Requires: python-chardet -Requires: python-cryptography -Requires: python-docutils -Requires: python-enum34 -Requires: python-flask -Requires: python-flask-wtf -Requires: python-flask-multistatic -Requires: python-markdown -Requires: python-psutil -Requires: python-pygit2 >= 0.20.1 -Requires: python-pygments -Requires: python-fedora -Requires: python-openid -Requires: python-openid-cla -Requires: python-openid-teams -Requires: python-straight-plugin -Requires: python-wtforms -Requires: python-munch -Requires: python-redis -Requires: mod_wsgi +Requires: py-bcrypt +Requires: python-alembic +Requires: python-arrow +Requires: python-binaryornot +Requires: python-bleach +Requires: python-blinker +Requires: python-chardet +Requires: python-cryptography +Requires: python-docutils +Requires: python-enum34 +Requires: python-flask +Requires: python-flask-wtf +Requires: python-flask-multistatic +Requires: python-markdown +Requires: python-psutil +Requires: python-pygit2 >= 0.20.1 +Requires: python-pygments +Requires: python-fedora +Requires: python-openid +Requires: python-openid-cla +Requires: python-openid-teams +Requires: python-straight-plugin +Requires: python-wtforms +Requires: python-munch +Requires: python-redis +Requires: mod_wsgi # No dependency of the app per se, but required to make it working. -Requires: gitolite3 +Requires: gitolite3 %description Pagure is a light-weight git-centered forge based on pygit2. @@ -90,7 +90,7 @@ system and possibilities to create new projects, fork existing ones and create/merge pull-requests across or within projects. -%package milters +%package milters Summary: Milter to integrate pagure with emails BuildArch: noarch BuildRequires: systemd-devel @@ -101,43 +101,62 @@ Requires(postun): systemd # It would work with sendmail but we configure things (like the tempfile) # to work with postfix Requires: postfix -%description milters +%description milters Milters (Mail filters) allowing the integration of pagure and emails. This is useful for example to allow commenting on a ticket by email. -%package ev -Summary: EventSource server for pagure -BuildArch: noarch +%package ev +Summary: EventSource server for pagure +BuildArch: noarch BuildRequires: systemd-devel -Requires: python-redis -Requires: python-trollius -Requires: python-trollius-redis -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%description ev +Requires: python-redis +Requires: python-trollius +Requires: python-trollius-redis +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%description ev Pagure comes with an eventsource server allowing live update of the pages supporting it. This package provides it. -%package webhook -Summary: Web-Hook server for pagure -BuildArch: noarch +%package webhook +Summary: Web-Hook server for pagure +BuildArch: noarch BuildRequires: systemd-devel -Requires: python-redis -Requires: python-trollius -Requires: python-trollius-redis -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%description webhook +Requires: python-redis +Requires: python-trollius +Requires: python-trollius-redis +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%description webhook Pagure comes with an webhook server allowing http callbacks for any action done on a project. This package provides it. +%package ci +Summary: A CI service for pagure +BuildArch: noarch + +BuildRequires: systemd-devel +Requires: python-redis +Requires: python-trollius +Requires: python-trollius-redis +Requires: python-jenkins +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%description ci +Pagure comes with a continuous integration service, currently supporting +only jenkins but extendable to others. +With this service, your CI server will be able to report the results of the +build on the pull-requests opened to your project. + + %prep %setup -q @@ -188,8 +207,8 @@ install -m 644 milters/comment_email_milter.py \ # Install the eventsource mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev -install -m 755 ev-server/pagure-stream-server.py \ - $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev/pagure-stream-server.py +install -m 755 ev-server/pagure_stream_server.py \ + $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev/pagure_stream_server.py install -m 644 ev-server/pagure_ev.service \ $RPM_BUILD_ROOT/%{_unitdir}/pagure_ev.service @@ -200,12 +219,22 @@ install -m 755 webhook-server/pagure-webhook-server.py \ install -m 644 webhook-server/pagure_webhook.service \ $RPM_BUILD_ROOT/%{_unitdir}/pagure_webhook.service +# Install the ci service +mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ci +install -m 755 pagure-ci/pagure_ci_server.py \ + $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ci/pagure_ci_server.py +install -m 644 pagure-ci/pagure_ci.service \ + $RPM_BUILD_ROOT/%{_unitdir}/pagure_ci.service + + %post milters %systemd_post pagure_milter.service %post ev %systemd_post pagure_ev.service %post webhook %systemd_post pagure_webhook.service +%post ci +%systemd_post pagure_ci.service %preun milters %systemd_preun pagure_milter.service @@ -213,6 +242,8 @@ install -m 644 webhook-server/pagure_webhook.service \ %systemd_preun pagure_ev.service %preun webhook %systemd_preun pagure_webhook.service +%preun ci +%systemd_preun pagure_ci.service %postun milters %systemd_postun_with_restart pagure_milter.service @@ -220,6 +251,8 @@ install -m 644 webhook-server/pagure_webhook.service \ %systemd_postun_with_restart pagure_ev.service %postun webhook %systemd_postun_with_restart pagure_webhook.service +%postun ci +%systemd_postun_with_restart pagure_ci.service %files @@ -258,7 +291,16 @@ install -m 644 webhook-server/pagure_webhook.service \ %{_unitdir}/pagure_webhook.service +%files ci +%license LICENSE +%{_libexecdir}/pagure-ci/ +%{_unitdir}/pagure_ci.service + + %changelog +* Mon Dec 26 2016 Pierre-Yves Chibon - 2.10.1-1 +- Update to 2.10.1 + * Thu Aug 04 2016 Bruno Wolff III - 2.3.4-1 - Update to 2.3.4 - Security fix release blocking all html related mimetype when displaying the