Accepting request 974749 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/974749
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pagure?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2022-05-03 19:19:36 +00:00 committed by Git OBS Bridge
commit 5000df3c60
4 changed files with 204 additions and 180 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6158c875438ae9481bd7338bb5d9c87bb79be45e0a61965d900e278c4342f602
size 21939540

3
pagure-5.13.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f684d8193d4c4cf637b465c80cbfece6eb2b1646df3ec4f993adf75ea78d5a1a
size 22045766

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue May 3 16:57:56 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to 5.13.3
+ Warn users when a PR contains some characters
+ srcfpo theme:
+ Change "Packages" link to new packages website
+ left-align the lines in description
+ fas user url updated for new accounts system
+ Change fas link from admin.fp.o to accounts.fp.o
+ Remove message about 60 day key length
+ Escape $ to fix Jenkins interpolation warning
+ Fix another invalid <img> width/height attribute
+ Fix missing space before src in <script>
+ Remove duplicate class attribute from Clone dropdown
+ Fix invalid <img> height (no px is allowed here)
+ Add Translation status link on repo_info page at src.fp.o
+ Update fedmsg homepage
+ Add support for noggin with the FAS auth backend
+ Update collaborator access level descriptions
+ Fix a type, add missing work hand
+ Fix Pagure's overview page verbatim error
-------------------------------------------------------------------
Thu Sep 16 21:23:15 UTC 2021 - Neal Gompa <ngompa13@gmail.com>

View File

@ -1,6 +1,7 @@
#
# spec file for package pagure
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2021 Neal Gompa <ngompa13@gmail.com>.
#
# All modifications and additions to the file contributed by third parties
@ -21,9 +22,8 @@
%global __provides_exclude_from ^%{python3_sitelib}/pagure/.*$
%global __requires_exclude_from ^%{python3_sitelib}/pagure/.*$
Name: pagure
Version: 5.13.2
Version: 5.13.3
Release: 0
Summary: A git-centered forge
Group: Development/Tools/Version Control
@ -40,10 +40,8 @@ Source1: https://raw.githubusercontent.com/fedora-infra/python-fedora
# SUSE-specific README providing a quickstart guide
Source10: pagure-README.SUSE
# Backports from upstream
# SUSE-specific fixes
## Change the defaults in the example config to match packaging
Patch1000: pagure-5.0-default-example-cfg.patch
@ -52,12 +50,16 @@ BuildArch: noarch
BuildRequires: apache2
BuildRequires: nginx
BuildRequires: fdupes
BuildRequires: systemd-rpm-macros
BuildRequires: nginx
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: systemd-rpm-macros
BuildRequires: python3-Flask
BuildRequires: python3-Flask-WTF
BuildRequires: python3-Markdown
BuildRequires: python3-Pillow
BuildRequires: python3-alembic
BuildRequires: python3-arrow
BuildRequires: python3-bcrypt
@ -68,26 +70,26 @@ BuildRequires: python3-chardet
BuildRequires: python3-cryptography
BuildRequires: python3-docutils
BuildRequires: python3-email_validator
BuildRequires: python3-Flask
BuildRequires: python3-Flask-WTF
BuildRequires: python3-Markdown
BuildRequires: python3-Pillow
BuildRequires: python3-psutil
BuildRequires: python3-pygit2 >= 0.26.0
#BuildRequires: python3-fedora-flask
BuildRequires: python3-python3-openid
BuildRequires: python3-python-openid-cla
BuildRequires: python3-python-openid-teams
BuildRequires: python3-SQLAlchemy >= 0.8
BuildRequires: python3-straight-plugin
BuildRequires: python3-WTForms
BuildRequires: python3-munch
BuildRequires: python3-python-openid-cla
BuildRequires: python3-python-openid-teams
BuildRequires: python3-redis
BuildRequires: python3-straight-plugin
BuildRequires: python3-whitenoise
# We require OpenSSH 7.4+ for SHA256 support
Requires: openssh >= 7.4
Requires: python3-Flask
Requires: python3-Flask-WTF
Requires: python3-Markdown
Requires: python3-Pillow
Requires: python3-alembic
Requires: python3-arrow
Requires: python3-bcrypt
@ -99,21 +101,17 @@ Requires: python3-chardet
Requires: python3-cryptography
Requires: python3-docutils
Requires: python3-email_validator
Requires: python3-Flask
Requires: python3-Flask-WTF
Requires: python3-Markdown
Requires: python3-Pillow
Requires: python3-psutil
Requires: python3-pygit2 >= 0.26.0
#Requires: python3-fedora-flask
Requires: python3-python3-openid
Requires: python3-python-openid-cla
Requires: python3-python-openid-teams
Requires: python3-SQLAlchemy > 0.8
Requires: python3-straight-plugin
Requires: python3-WTForms
Requires: python3-munch
Requires: python3-python-openid-cla
Requires: python3-python-openid-teams
Requires: python3-redis
Requires: python3-straight-plugin
Requires: python3-whitenoise
# Required for celery
@ -163,7 +161,6 @@ create/merge pull-requests across or within projects.
For steps on how to set up the system after installing this package,
please read %{_docdir}/%{name}/README.SUSE.
%package web-apache-httpd
Summary: Apache HTTPD configuration for Pagure
Requires: %{name} = %{version}-%{release}
@ -171,75 +168,75 @@ Requires: apache2-mod_wsgi-python3
# Apache config moved out to its own subpackage
Obsoletes: %{name} < 5.10
Conflicts: %{name} < 5.10
%description web-apache-httpd
This package provides the configuration files for deploying
a Pagure server using the Apache HTTPD server.
%package web-nginx
Summary: Nginx configuration for Pagure
Requires: %{name} = %{version}-%{release}
Requires: nginx
Requires: python3-gunicorn
%description web-nginx
This package provides the configuration files for deploying
a Pagure server using the Nginx web server.
%package theme-upstream
Summary: Base theme for the Pagure web interface
Requires: %{name} = %{version}-%{release}
%description theme-upstream
This package provides the web interface assets for styling
a Pagure server with the base upstream look and feel.
%package theme-pagureio
Summary: Pagure web interface theme used on Pagure.io
Requires: %{name} = %{version}-%{release}
%description theme-pagureio
This package provides the web interface assets for styling
a Pagure server with the same look and feel as Pagure.io.
%package theme-srcfpo
Summary: Pagure web interface theme used on src.fedoraproject.org
Requires: %{name} = %{version}-%{release}
%description theme-srcfpo
This package provides the web interface assets for styling
a Pagure server with the same look and feel as src.fedoraproject.org.
%package theme-chameleon
Summary: Pagure web interface theme based on openSUSE's chameleon theme
Requires: %{name} = %{version}-%{release}
%description theme-chameleon
This package provides the web interface assets for styling
a Pagure server with the same look and feel as openSUSE Infrastructure.
%package theme-default-upstream
Summary: Configuration for pagure to default to the upstream web interface theme
Conflicts: %{name}-theme-default
Provides: %{name}-theme-default
Requires: %{name}-theme-upstream = %{version}-%{release}
%description theme-default-upstream
This package sets the default web interface assets used for
a Pagure server running as shipped by upstream.
%package theme-default-openSUSE
Summary: Configuration for pagure to default to the openSUSE web interface theme
Conflicts: %{name}-theme-default
Provides: %{name}-theme-default
Requires: %{name}-theme-chameleon = %{version}-%{release}
Enhances: (%{name} and branding-openSUSE)
RemovePathPostfixes: .openSUSE
Removepathpostfixes:.openSUSE
%description theme-default-openSUSE
This package sets the default web interface assets used for
a Pagure server running on openSUSE.
%package milters
Summary: Milter to integrate pagure with emails
BuildRequires: systemd-rpm-macros
@ -249,76 +246,76 @@ Requires: python3-pymilter
# It would work with sendmail but we configure things (like the tempfile)
# to work with postfix
Requires: postfix
%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
BuildRequires: systemd-rpm-macros
Requires: %{name} = %{version}-%{release}
Requires: python3-Trololio
%{?systemd_requires}
%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
BuildRequires: systemd-rpm-macros
Requires: %{name} = %{version}-%{release}
%{?systemd_requires}
%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
BuildRequires: systemd-rpm-macros
Requires: %{name} = %{version}-%{release}
Requires: python3-python-jenkins
%{?systemd_requires}
%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.
%package logcom
Summary: The logcom service for pagure
BuildRequires: systemd-rpm-macros
Requires: %{name} = %{version}-%{release}
%{?systemd_requires}
%description logcom
pagure-logcom contains the service that logs commits into the database so that
the activity calendar heatmap is filled.
%package loadjson
Summary: The loadjson service for pagure
BuildRequires: systemd-rpm-macros
Requires: %{name} = %{version}-%{release}
%{?systemd_requires}
%description loadjson
pagure-loadjson is the service allowing to update the database with the
information provided in the JSON blobs that are stored in the tickets (and
in the future pull-requests) git repo.
%package mirror
Summary: The mirroring service for pagure
BuildRequires: systemd-rpm-macros
Requires: %{name} = %{version}-%{release}
%{?systemd_requires}
%description mirror
pagure-mirror is the service mirroring projects that asked for it outside
of this pagure instance.
%prep
%autosetup -p1
@ -329,11 +326,9 @@ sed -e "s/import flask_fas_openid/from pagure.ui import flask_fas_openid as flas
# Install README.SUSE file
install -pm 0644 %{SOURCE10} README.SUSE
%build
%py3_build
%install
%py3_install
@ -473,7 +468,7 @@ ln -sr %{buildroot}/%{python3_sitelib}/pagure/themes/chameleon %{buildroot}/%{py
# Run fdupes
%fdupes %{buildroot}/%{python3_sitelib}
%fdupes doc/
%fdupes doc/_build/html
# Make log directory and files
mkdir -p %{buildroot}/%{_localstatedir}/log/pagure
@ -526,22 +521,30 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%systemd_post pagure_gitolite_worker.service
%systemd_post pagure_api_key_expire_mail.timer
%systemd_post pagure_mirror_project_in.timer
%post web-nginx
%systemd_post pagure_web.service
%systemd_post pagure_docs_web.service
%post milters
%tmpfiles_create %{_tmpfilesdir}/%{name}-milter.conf
%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
%post logcom
%systemd_post pagure_logcom.service
%post loadjson
%systemd_post pagure_loadjson.service
%post mirror
%systemd_post pagure_mirror.service
@ -551,21 +554,29 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%systemd_preun pagure_gitolite_worker.service
%systemd_preun pagure_api_key_expire_mail.timer
%systemd_preun pagure_mirror_project_in.timer
%preun web-nginx
%systemd_preun pagure_web.service
%systemd_preun pagure_docs_web.service
%preun milters
%systemd_preun pagure_milter.service
%preun ev
%systemd_preun pagure_ev.service
%preun webhook
%systemd_preun pagure_webhook.service
%preun ci
%systemd_preun pagure_ci.service
%preun logcom
%systemd_preun pagure_logcom.service
%preun loadjson
%systemd_preun pagure_loadjson.service
%preun mirror
%systemd_preun pagure_mirror.service
@ -575,27 +586,34 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%systemd_postun_with_restart pagure_gitolite_worker.service
%systemd_postun pagure_api_key_expire_mail.timer
%systemd_postun pagure_mirror_project_in.timer
%postun web-nginx
%systemd_postun_with_restart pagure_web.service
%systemd_postun_with_restart pagure_docs_web.service
%postun milters
%systemd_postun_with_restart pagure_milter.service
%postun ev
%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
%postun logcom
%systemd_postun_with_restart pagure_logcom.service
%postun loadjson
%systemd_postun_with_restart pagure_loadjson.service
%postun mirror
%systemd_postun_with_restart pagure_mirror.service
%files
%doc README.SUSE README.rst UPGRADING.rst doc/ files/gitolite3.rc files/pagure.cfg.sample
%doc README.SUSE README.rst UPGRADING.rst doc/_build/html files/gitolite3.rc files/pagure.cfg.sample
%license LICENSE
%config(noreplace) %{_sysconfdir}/pagure/pagure.cfg
%config(noreplace) %{_sysconfdir}/pagure/alembic.ini
@ -637,14 +655,12 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%attr(-,git,git) %dir /srv/www/pagure-releases
%attr(-,git,git) %dir %{_localstatedir}/log/pagure
%files web-apache-httpd
%license LICENSE
%doc files/pagure-apache-httpd.conf
%config(noreplace) %{_sysconfdir}/apache2/vhosts.d/pagure.conf
%config(noreplace) %{_datadir}/pagure/*.wsgi
%files web-nginx
%license LICENSE
%doc files/pagure-nginx.conf
@ -654,37 +670,30 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%ghost %{_localstatedir}/log/pagure/access_*.log
%ghost %{_localstatedir}/log/pagure/error_*.log
%files theme-upstream
%license LICENSE
%{python3_sitelib}/pagure/themes/upstream/
%files theme-pagureio
%license LICENSE
%{python3_sitelib}/pagure/themes/pagureio/
%files theme-srcfpo
%license LICENSE
%{python3_sitelib}/pagure/themes/srcfpo/
%files theme-chameleon
%license LICENSE
%{python3_sitelib}/pagure/themes/chameleon/
%files theme-default-upstream
%license LICENSE
%{python3_sitelib}/pagure/themes/default
%files theme-default-openSUSE
%license LICENSE
%{python3_sitelib}/pagure/themes/default.openSUSE
%files milters
%license LICENSE
%dir %{_datadir}/pagure/
@ -693,43 +702,35 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%{_datadir}/pagure/comment_email_milter.py*
%{_sbindir}/rcpagure_milter
%files ev
%license LICENSE
%{_libexecdir}/pagure-ev/
%{_unitdir}/pagure_ev.service
%{_sbindir}/rcpagure_ev
%files webhook
%license LICENSE
%{_unitdir}/pagure_webhook.service
%{_sbindir}/rcpagure_webhook
%files ci
%license LICENSE
%{_unitdir}/pagure_ci.service
%{_sbindir}/rcpagure_ci
%files logcom
%license LICENSE
%{_unitdir}/pagure_logcom.service
%{_sbindir}/rcpagure_logcom
%files loadjson
%license LICENSE
%{_unitdir}/pagure_loadjson.service
%{_sbindir}/rcpagure_loadjson
%files mirror
%license LICENSE
%{_unitdir}/pagure_mirror.service
%{_sbindir}/rcpagure_mirror
%changelog