Accepting request 639552 from home:jengelh:branches:devel:tools:scm

- Trim bias from description. Replace old $RPM_* shell vars by
  macros.
- Update summaries to include those are Pagure themes.

OBS-URL: https://build.opensuse.org/request/show/639552
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/pagure?expand=0&rev=2
This commit is contained in:
Neal Gompa 2018-10-02 11:22:37 +00:00 committed by Git OBS Bridge
parent b12f70e978
commit daac880e0e
2 changed files with 75 additions and 68 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 2 09:28:36 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Trim bias from description. Replace old $RPM_* shell vars by
macros.
- Update summaries to include those are Pagure themes.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 30 15:06:24 UTC 2018 - Neal Gompa <ngompa13@gmail.com> Sun Sep 30 15:06:24 UTC 2018 - Neal Gompa <ngompa13@gmail.com>

View File

@ -140,7 +140,7 @@ Requires: gitolite >= 3.0
Requires(post): user(wwwrun) Requires(post): user(wwwrun)
%description %description
Pagure is a light-weight git-centered forge based on pygit2. Pagure is a git-centered forge based on pygit2.
Currently, Pagure offers a web-interface for git repositories, a ticket Currently, Pagure offers a web-interface for git repositories, a ticket
system and possibilities to create new projects, fork existing ones and system and possibilities to create new projects, fork existing ones and
@ -151,7 +151,7 @@ please read %{_docdir}/%{name}/README.SUSE.
%package theme-upstream %package theme-upstream
Summary: Base web interface theme Summary: Base theme for the Pagure web interface
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description theme-upstream %description theme-upstream
This package provides the web interface assets for styling This package provides the web interface assets for styling
@ -159,7 +159,7 @@ a Pagure server with the base upstream look and feel.
%package theme-pagureio %package theme-pagureio
Summary: Web interface theme used for Pagure.io Summary: Pagure web interface theme used on Pagure.io
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description theme-pagureio %description theme-pagureio
This package provides the web interface assets for styling This package provides the web interface assets for styling
@ -167,7 +167,7 @@ a Pagure server with the same look and feel as Pagure.io.
%package theme-srcfpo %package theme-srcfpo
Summary: Web interface theme used for src.fedoraproject.org Summary: Pagure web interface theme used on src.fedoraproject.org
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description theme-srcfpo %description theme-srcfpo
This package provides the web interface assets for styling This package provides the web interface assets for styling
@ -175,7 +175,7 @@ a Pagure server with the same look and feel as src.fedoraproject.org.
%package theme-chameleon %package theme-chameleon
Summary: Web interface based on openSUSE's chameleon theme Summary: Pagure web interface theme based on openSUSE's chameleon theme
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description theme-chameleon %description theme-chameleon
This package provides the web interface assets for styling This package provides the web interface assets for styling
@ -183,7 +183,7 @@ a Pagure server with the same look and feel as openSUSE Infrastructure.
%package theme-default-upstream %package theme-default-upstream
Summary: Default web interface theme from upstream Summary: Configuration for pagure to default to the upstream web interface theme
Conflicts: %{name}-theme-default Conflicts: %{name}-theme-default
Provides: %{name}-theme-default Provides: %{name}-theme-default
Requires: %{name}-theme-upstream = %{version}-%{release} Requires: %{name}-theme-upstream = %{version}-%{release}
@ -193,7 +193,7 @@ a Pagure server running as shipped by upstream.
%package theme-default-openSUSE %package theme-default-openSUSE
Summary: Default web interface theme for openSUSE Summary: Configuration for pagure to default to the openSUSE web interface theme
Conflicts: %{name}-theme-default Conflicts: %{name}-theme-default
Provides: %{name}-theme-default Provides: %{name}-theme-default
Requires: %{name}-theme-chameleon = %{version}-%{release} Requires: %{name}-theme-chameleon = %{version}-%{release}
@ -302,149 +302,149 @@ install -pm 0644 %{SOURCE10} README.SUSE
%py3_install %py3_install
# Install apache configuration file # Install apache configuration file
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/apache2/vhosts.d mkdir -p %{buildroot}/%{_sysconfdir}/apache2/vhosts.d
install -p -m 644 files/pagure.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apache2/vhosts.d/pagure.conf install -p -m 644 files/pagure.conf %{buildroot}/%{_sysconfdir}/apache2/vhosts.d/pagure.conf
# Install configuration file # Install configuration file
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pagure mkdir -p %{buildroot}/%{_sysconfdir}/pagure
install -p -m 644 files/pagure.cfg.sample $RPM_BUILD_ROOT/%{_sysconfdir}/pagure/pagure.cfg install -p -m 644 files/pagure.cfg.sample %{buildroot}/%{_sysconfdir}/pagure/pagure.cfg
# Install WSGI file # Install WSGI file
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pagure mkdir -p %{buildroot}/%{_datadir}/pagure
install -p -m 644 files/pagure.wsgi $RPM_BUILD_ROOT/%{_datadir}/pagure/pagure.wsgi install -p -m 644 files/pagure.wsgi %{buildroot}/%{_datadir}/pagure/pagure.wsgi
install -p -m 644 files/doc_pagure.wsgi $RPM_BUILD_ROOT/%{_datadir}/pagure/doc_pagure.wsgi install -p -m 644 files/doc_pagure.wsgi %{buildroot}/%{_datadir}/pagure/doc_pagure.wsgi
# Install the createdb script # Install the createdb script
install -p -m 644 createdb.py $RPM_BUILD_ROOT/%{_datadir}/pagure/pagure_createdb.py install -p -m 644 createdb.py %{buildroot}/%{_datadir}/pagure/pagure_createdb.py
# Install the api_key_expire_mail.py script # Install the api_key_expire_mail.py script
install -p -m 644 files/api_key_expire_mail.py $RPM_BUILD_ROOT/%{_datadir}/pagure/api_key_expire_mail.py install -p -m 644 files/api_key_expire_mail.py %{buildroot}/%{_datadir}/pagure/api_key_expire_mail.py
# Install the keyhelper and aclcheck scripts # Install the keyhelper and aclcheck scripts
mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/pagure mkdir -p %{buildroot}/%{_libexecdir}/pagure
install -p -m 755 files/aclchecker.py $RPM_BUILD_ROOT/%{_libexecdir}/pagure/aclchecker.py install -p -m 755 files/aclchecker.py %{buildroot}/%{_libexecdir}/pagure/aclchecker.py
install -p -m 755 files/keyhelper.py $RPM_BUILD_ROOT/%{_libexecdir}/pagure/keyhelper.py install -p -m 755 files/keyhelper.py %{buildroot}/%{_libexecdir}/pagure/keyhelper.py
# Install the alembic configuration file # Install the alembic configuration file
install -p -m 644 files/alembic.ini $RPM_BUILD_ROOT/%{_sysconfdir}/pagure/alembic.ini install -p -m 644 files/alembic.ini %{buildroot}/%{_sysconfdir}/pagure/alembic.ini
# Install the alembic revisions # Install the alembic revisions
cp -r alembic $RPM_BUILD_ROOT/%{_datadir}/pagure cp -r alembic %{buildroot}/%{_datadir}/pagure
# Install the systemd file for the worker # Install the systemd file for the worker
mkdir -p $RPM_BUILD_ROOT/%{_unitdir} mkdir -p %{buildroot}/%{_unitdir}
install -p -m 644 files/pagure_worker.service \ install -p -m 644 files/pagure_worker.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_worker.service %{buildroot}/%{_unitdir}/pagure_worker.service
# Install the systemd file for the gitolite worker # Install the systemd file for the gitolite worker
install -p -m 644 files/pagure_gitolite_worker.service \ install -p -m 644 files/pagure_gitolite_worker.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_gitolite_worker.service %{buildroot}/%{_unitdir}/pagure_gitolite_worker.service
# Install the systemd file for the web-hook # Install the systemd file for the web-hook
install -p -m 644 files/pagure_webhook.service \ install -p -m 644 files/pagure_webhook.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_webhook.service %{buildroot}/%{_unitdir}/pagure_webhook.service
# Install the systemd file for the ci service # Install the systemd file for the ci service
install -p -m 644 files/pagure_ci.service \ install -p -m 644 files/pagure_ci.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_ci.service %{buildroot}/%{_unitdir}/pagure_ci.service
# Install the systemd file for the logcom service # Install the systemd file for the logcom service
install -p -m 644 files/pagure_logcom.service \ install -p -m 644 files/pagure_logcom.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_logcom.service %{buildroot}/%{_unitdir}/pagure_logcom.service
# Install the systemd file for the loadjson service # Install the systemd file for the loadjson service
install -p -m 644 files/pagure_loadjson.service \ install -p -m 644 files/pagure_loadjson.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_loadjson.service %{buildroot}/%{_unitdir}/pagure_loadjson.service
# Install the systemd file for the mirror service # Install the systemd file for the mirror service
install -p -m 644 files/pagure_mirror.service \ install -p -m 644 files/pagure_mirror.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_mirror.service %{buildroot}/%{_unitdir}/pagure_mirror.service
# Install the systemd file for the script sending reminder about API key # Install the systemd file for the script sending reminder about API key
# expiration # expiration
install -p -m 644 files/pagure_api_key_expire_mail.service \ install -p -m 644 files/pagure_api_key_expire_mail.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_api_key_expire_mail.service %{buildroot}/%{_unitdir}/pagure_api_key_expire_mail.service
install -p -m 644 files/pagure_api_key_expire_mail.timer \ install -p -m 644 files/pagure_api_key_expire_mail.timer \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_api_key_expire_mail.timer %{buildroot}/%{_unitdir}/pagure_api_key_expire_mail.timer
# Install the milter files # Install the milter files
mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir} mkdir -p %{buildroot}/%{_tmpfilesdir}
install -p -m 0644 pagure-milters/milter_tempfile.conf \ install -p -m 0644 pagure-milters/milter_tempfile.conf \
$RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}-milter.conf %{buildroot}/%{_tmpfilesdir}/%{name}-milter.conf
install -p -m 644 pagure-milters/pagure_milter.service \ install -p -m 644 pagure-milters/pagure_milter.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_milter.service %{buildroot}/%{_unitdir}/pagure_milter.service
install -p -m 644 pagure-milters/comment_email_milter.py \ install -p -m 644 pagure-milters/comment_email_milter.py \
$RPM_BUILD_ROOT/%{_datadir}/pagure/comment_email_milter.py %{buildroot}/%{_datadir}/pagure/comment_email_milter.py
# Install the eventsource # Install the eventsource
mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev mkdir -p %{buildroot}/%{_libexecdir}/pagure-ev
install -p -m 755 pagure-ev/pagure_stream_server.py \ install -p -m 755 pagure-ev/pagure_stream_server.py \
$RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev/pagure_stream_server.py %{buildroot}/%{_libexecdir}/pagure-ev/pagure_stream_server.py
install -p -m 644 pagure-ev/pagure_ev.service \ install -p -m 644 pagure-ev/pagure_ev.service \
$RPM_BUILD_ROOT/%{_unitdir}/pagure_ev.service %{buildroot}/%{_unitdir}/pagure_ev.service
# Switch all systemd units to use the correct libexecdir # Switch all systemd units to use the correct libexecdir
sed -e "s|/usr/libexec|%{_libexecdir}|g" -i $RPM_BUILD_ROOT/%{_unitdir}/*.service sed -e "s|/usr/libexec|%{_libexecdir}|g" -i %{buildroot}/%{_unitdir}/*.service
# Change default_config.py to use the correct libexecdir # Change default_config.py to use the correct libexecdir
sed -e "s|/usr/libexec|%{_libexecdir}|g" -i $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/default_config.py sed -e "s|/usr/libexec|%{_libexecdir}|g" -i %{buildroot}/%{python3_sitelib}/pagure/default_config.py
# Fix the shebang for various scripts # Fix the shebang for various scripts
sed -e "s|#!/usr/bin/env python|#!%{__python3}|" -i \ sed -e "s|#!/usr/bin/env python|#!%{__python3}|" -i \
$RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev/pagure_stream_server.py \ %{buildroot}/%{_libexecdir}/pagure-ev/pagure_stream_server.py \
$RPM_BUILD_ROOT/%{_libexecdir}/pagure/aclchecker.py \ %{buildroot}/%{_libexecdir}/pagure/aclchecker.py \
$RPM_BUILD_ROOT/%{_libexecdir}/pagure/keyhelper.py \ %{buildroot}/%{_libexecdir}/pagure/keyhelper.py \
$RPM_BUILD_ROOT/%{_datadir}/pagure/comment_email_milter.py \ %{buildroot}/%{_datadir}/pagure/comment_email_milter.py \
$RPM_BUILD_ROOT/%{_datadir}/pagure/pagure_createdb.py \ %{buildroot}/%{_datadir}/pagure/pagure_createdb.py \
$RPM_BUILD_ROOT/%{_datadir}/pagure/api_key_expire_mail.py \ %{buildroot}/%{_datadir}/pagure/api_key_expire_mail.py \
$RPM_BUILD_ROOT/%{python3_sitelib}/pagure/hooks/files/*.py \ %{buildroot}/%{python3_sitelib}/pagure/hooks/files/*.py \
$RPM_BUILD_ROOT/%{python3_sitelib}/pagure/hooks/files/hookrunner \ %{buildroot}/%{python3_sitelib}/pagure/hooks/files/hookrunner \
$RPM_BUILD_ROOT/%{python3_sitelib}/pagure/hooks/files/post-receive \ %{buildroot}/%{python3_sitelib}/pagure/hooks/files/post-receive \
$RPM_BUILD_ROOT/%{python3_sitelib}/pagure/hooks/files/pre-receive \ %{buildroot}/%{python3_sitelib}/pagure/hooks/files/pre-receive \
$RPM_BUILD_ROOT/%{python3_sitelib}/pagure/hooks/files/repospannerhook %{buildroot}/%{python3_sitelib}/pagure/hooks/files/repospannerhook
# Switch interpreter for systemd units to correct Python interpreter # Switch interpreter for systemd units to correct Python interpreter
sed -e "s|/usr/bin/python|%{__python3}|g" -i $RPM_BUILD_ROOT/%{_unitdir}/*.service sed -e "s|/usr/bin/python|%{__python3}|g" -i %{buildroot}/%{_unitdir}/*.service
# Change to correct static file path for apache httpd # Change to correct static file path for apache httpd
sed -e "s/pythonX.Y/python%{python3_version}/g" -i $RPM_BUILD_ROOT/%{_sysconfdir}/apache2/vhosts.d/pagure.conf sed -e "s/pythonX.Y/python%{python3_version}/g" -i %{buildroot}/%{_sysconfdir}/apache2/vhosts.d/pagure.conf
# Make symlinks for default theme packages # Make symlinks for default theme packages
mv $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/themes/default $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/themes/upstream mv %{buildroot}/%{python3_sitelib}/pagure/themes/default %{buildroot}/%{python3_sitelib}/pagure/themes/upstream
ln -sr $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/themes/upstream $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/themes/default ln -sr %{buildroot}/%{python3_sitelib}/pagure/themes/upstream %{buildroot}/%{python3_sitelib}/pagure/themes/default
ln -sr $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/themes/chameleon $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/themes/default.openSUSE ln -sr %{buildroot}/%{python3_sitelib}/pagure/themes/chameleon %{buildroot}/%{python3_sitelib}/pagure/themes/default.openSUSE
# Run fdupes # Run fdupes
%fdupes $RPM_BUILD_ROOT/%{python3_sitelib} %fdupes %{buildroot}/%{python3_sitelib}
%fdupes doc/ %fdupes doc/
# Regenerate clobbered symlinks (Cf. https://pagure.io/pagure/issue/3782) # Regenerate clobbered symlinks (Cf. https://pagure.io/pagure/issue/3782)
runnerhooks="post-receive pre-receive" runnerhooks="post-receive pre-receive"
for runnerhook in $runnerhooks; do for runnerhook in $runnerhooks; do
rm -rf $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/hooks/files/$runnerhook rm -rf %{buildroot}/%{python3_sitelib}/pagure/hooks/files/$runnerhook
ln -sf hookrunner $RPM_BUILD_ROOT/%{python3_sitelib}/pagure/hooks/files/$runnerhook ln -sf hookrunner %{buildroot}/%{python3_sitelib}/pagure/hooks/files/$runnerhook
done done
# Make the rcFOO symlinks for systemd services # Make the rcFOO symlinks for systemd services
mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mkdir -p %{buildroot}/%{_sbindir}
paguresvcs="api_key_expire_mail ci ev gitolite_worker loadjson logcom milter mirror webhook worker" paguresvcs="api_key_expire_mail ci ev gitolite_worker loadjson logcom milter mirror webhook worker"
for paguresvc in $paguresvcs; do for paguresvc in $paguresvcs; do
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT/%{_sbindir}/rcpagure_$paguresvc ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcpagure_$paguresvc
done done
# Install the basic directory structure # Install the basic directory structure
mkdir -p $RPM_BUILD_ROOT/srv/www/pagure-releases mkdir -p %{buildroot}/srv/www/pagure-releases
mkdir -p $RPM_BUILD_ROOT/srv/gitolite/pseudo mkdir -p %{buildroot}/srv/gitolite/pseudo
mkdir -p $RPM_BUILD_ROOT/srv/gitolite/repositories/{,docs,forks,requests,tickets} mkdir -p %{buildroot}/srv/gitolite/repositories/{,docs,forks,requests,tickets}
mkdir -p $RPM_BUILD_ROOT/srv/gitolite/remotes mkdir -p %{buildroot}/srv/gitolite/remotes
mkdir -p $RPM_BUILD_ROOT/srv/gitolite/.gitolite/{conf,keydir,logs} mkdir -p %{buildroot}/srv/gitolite/.gitolite/{conf,keydir,logs}
# Add empty gitolite config file # Add empty gitolite config file
touch $RPM_BUILD_ROOT/srv/gitolite/.gitolite/conf/gitolite.conf touch %{buildroot}/srv/gitolite/.gitolite/conf/gitolite.conf
# Install gitolite rc file # Install gitolite rc file
install -p -m 644 files/gitolite3.rc $RPM_BUILD_ROOT/srv/gitolite/.gitolite.rc install -p -m 644 files/gitolite3.rc %{buildroot}/srv/gitolite/.gitolite.rc
%pre %pre
# Do nothing, but ensure dependency is evaluated... # Do nothing, but ensure dependency is evaluated...