From 10b05852863f61ed4ee3b5a436011d9ede67e138 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Feb 22 2019 15:01:33 +0000 Subject: Update to 5.3 - Add weak dependencies for supported database client libraries - Use macros consistently in the spec --- diff --git a/.gitignore b/.gitignore index 9ff149d..14be466 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /pagure-5.1.3.tar.gz /pagure-5.1.4.tar.gz /pagure-5.2.tar.gz +/pagure-5.3.tar.gz diff --git a/pagure.spec b/pagure.spec index b5ef807..6170b45 100644 --- a/pagure.spec +++ b/pagure.spec @@ -16,8 +16,8 @@ Name: pagure -Version: 5.2 -Release: 3%{?dist} +Version: 5.3 +Release: 1%{?dist} Summary: A git-centered forge License: GPLv2+ @@ -83,6 +83,14 @@ Requires: python%{python_pkgversion}-mod_wsgi %{?systemd_requires} +%if 0%{?fedora} || 0%{?rhel} >= 8 +# If using PostgreSQL, the correct driver should be installed +Recommends: ((python3-psycopg2 or python3-pg8000) if postgresql-server) + +# If using MariaDB/MySQL, the correct driver should be installed +Recommends: ((python3-mysql or python3-PyMySQL) if mysql-server) +%endif + # No dependency of the app per se, but required to make it working. Requires: gitolite3 @@ -221,128 +229,128 @@ sed -e "s/^python3-openid$//g" -i requirements.txt %py_install # Install apache configuration file -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/ -install -p -m 644 files/pagure.conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/pagure.conf +mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/ +install -p -m 644 files/pagure.conf %{buildroot}/%{_sysconfdir}/httpd/conf.d/pagure.conf # Install configuration file -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pagure -install -p -m 644 files/pagure.cfg.sample $RPM_BUILD_ROOT/%{_sysconfdir}/pagure/pagure.cfg +mkdir -p %{buildroot}/%{_sysconfdir}/pagure +install -p -m 644 files/pagure.cfg.sample %{buildroot}/%{_sysconfdir}/pagure/pagure.cfg # Install WSGI file -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pagure -install -p -m 644 files/pagure.wsgi $RPM_BUILD_ROOT/%{_datadir}/pagure/pagure.wsgi -install -p -m 644 files/doc_pagure.wsgi $RPM_BUILD_ROOT/%{_datadir}/pagure/doc_pagure.wsgi +mkdir -p %{buildroot}/%{_datadir}/pagure +install -p -m 644 files/pagure.wsgi %{buildroot}/%{_datadir}/pagure/pagure.wsgi +install -p -m 644 files/doc_pagure.wsgi %{buildroot}/%{_datadir}/pagure/doc_pagure.wsgi # 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 -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 mirror_project_in.py script -install -p -m 644 files/mirror_project_in.py $RPM_BUILD_ROOT/%{_datadir}/pagure/mirror_project_in.py +install -p -m 644 files/mirror_project_in.py %{buildroot}/%{_datadir}/pagure/mirror_project_in.py # Install the keyhelper and aclcheck scripts -mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/pagure/ -install -p -m 755 files/aclchecker.py $RPM_BUILD_ROOT/%{_libexecdir}/pagure/aclchecker.py -install -p -m 755 files/keyhelper.py $RPM_BUILD_ROOT/%{_libexecdir}/pagure/keyhelper.py +mkdir -p %{buildroot}/%{_libexecdir}/pagure/ +install -p -m 755 files/aclchecker.py %{buildroot}/%{_libexecdir}/pagure/aclchecker.py +install -p -m 755 files/keyhelper.py %{buildroot}/%{_libexecdir}/pagure/keyhelper.py # 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 -cp -r alembic $RPM_BUILD_ROOT/%{_datadir}/pagure +cp -r alembic %{buildroot}/%{_datadir}/pagure # 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 \ - $RPM_BUILD_ROOT/%{_unitdir}/pagure_worker.service + %{buildroot}/%{_unitdir}/pagure_worker.service # Install the systemd file for the gitolite worker 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 -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 -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 -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 -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 -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 # expiration 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 \ - $RPM_BUILD_ROOT/%{_unitdir}/pagure_api_key_expire_mail.timer + %{buildroot}/%{_unitdir}/pagure_api_key_expire_mail.timer # Install the systemd file for the script updating mirrored project install -p -m 644 files/pagure_mirror_project_in.service \ - $RPM_BUILD_ROOT/%{_unitdir}/pagure_mirror_project_in.service + %{buildroot}/%{_unitdir}/pagure_mirror_project_in.service install -p -m 644 files/pagure_mirror_project_in.timer \ - $RPM_BUILD_ROOT/%{_unitdir}/pagure_mirror_project_in.timer + %{buildroot}/%{_unitdir}/pagure_mirror_project_in.timer # Install the milter files -mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pagure -mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir} +mkdir -p %{buildroot}/%{_localstatedir}/run/pagure +mkdir -p %{buildroot}/%{_tmpfilesdir} 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 \ - $RPM_BUILD_ROOT/%{_unitdir}/pagure_milter.service + %{buildroot}/%{_unitdir}/pagure_milter.service 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 -mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev +mkdir -p %{buildroot}/%{_libexecdir}/pagure-ev 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 \ - $RPM_BUILD_ROOT/%{_unitdir}/pagure_ev.service + %{buildroot}/%{_unitdir}/pagure_ev.service # Fix the shebang for various scripts sed -e "s|#!/usr/bin/env python|#!%{__python}|" -i \ - $RPM_BUILD_ROOT/%{_libexecdir}/pagure-ev/*.py \ - $RPM_BUILD_ROOT/%{_libexecdir}/pagure/*.py \ - $RPM_BUILD_ROOT/%{_datadir}/pagure/*.py \ - $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/*.py \ - $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/hookrunner \ - $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/post-receive \ - $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/pre-receive \ - $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/repospannerhook + %{buildroot}/%{_libexecdir}/pagure-ev/*.py \ + %{buildroot}/%{_libexecdir}/pagure/*.py \ + %{buildroot}/%{_datadir}/pagure/*.py \ + %{buildroot}/%{python_sitelib}/pagure/hooks/files/*.py \ + %{buildroot}/%{python_sitelib}/pagure/hooks/files/hookrunner \ + %{buildroot}/%{python_sitelib}/pagure/hooks/files/post-receive \ + %{buildroot}/%{python_sitelib}/pagure/hooks/files/pre-receive \ + %{buildroot}/%{python_sitelib}/pagure/hooks/files/repospannerhook # Switch interpreter for systemd units -sed -e "s|/usr/bin/python|%{__python}|g" -i $RPM_BUILD_ROOT/%{_unitdir}/*.service +sed -e "s|/usr/bin/python|%{__python}|g" -i %{buildroot}/%{_unitdir}/*.service %if 0%{?rhel} && 0%{?rhel} < 8 # Change to correct static file path for apache httpd -sed -e "s/pythonX.Y/python%{python2_version}/g" -i $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/pagure.conf +sed -e "s/pythonX.Y/python%{python2_version}/g" -i %{buildroot}/%{_sysconfdir}/httpd/conf.d/pagure.conf %else # Switch all systemd units to use the correct celery -sed -e "s|/usr/bin/celery|/usr/bin/celery-3|g" -i $RPM_BUILD_ROOT/%{_unitdir}/*.service +sed -e "s|/usr/bin/celery|/usr/bin/celery-3|g" -i %{buildroot}/%{_unitdir}/*.service # Change to correct static file path for apache httpd -sed -e "s/pythonX.Y/python%{python3_version}/g" -i $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/pagure.conf +sed -e "s/pythonX.Y/python%{python3_version}/g" -i %{buildroot}/%{_sysconfdir}/httpd/conf.d/pagure.conf %endif # Regenerate missing symlinks (really needed for upgrades from pagure < 5.0) runnerhooks="post-receive pre-receive" for runnerhook in $runnerhooks; do - rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/$runnerhook - ln -sf hookrunner $RPM_BUILD_ROOT/%{python_sitelib}/pagure/hooks/files/$runnerhook + rm -rf %{buildroot}/%{python_sitelib}/pagure/hooks/files/$runnerhook + ln -sf hookrunner %{buildroot}/%{python_sitelib}/pagure/hooks/files/$runnerhook done %post @@ -491,6 +499,11 @@ done %changelog +* Fri Feb 22 2019 Neal Gompa - 5.3-1 +- Update to 5.3 +- Add weak dependencies for supported database client libraries +- Use macros consistently in the spec + * Fri Feb 01 2019 Fedora Release Engineering - 5.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index e6b1ac9..6a691f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pagure-5.2.tar.gz) = 047c9690e8ee8b5d4facf98ada56f050fe888ecd1ce3f026f0d4e99ffdee11a570ed67acfbbc1fbab36abba2b0e9175cc8874fd0a81dcded54eef43134955b8e +SHA512 (pagure-5.3.tar.gz) = 015c8367da8d20bf3cde255799ff207df01bf1e1115deb5abdd8c83d1f81231dc53e49cdf07a7824adf79199ad15963acabef8520d72a8321ab6bbf3224cb3ad