From 9f52eb7e6536f1f85ac0bedad06bf8c7ab4bcad0 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Feb 07 2019 13:28:20 +0000 Subject: Update abrt-server-info-page to 1.7-1 Signed-off-by: Martin Kutlak --- diff --git a/.gitignore b/.gitignore index 71ac8e6..5585d1f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /abrt-server-info-page-1.4.tar.gz /abrt-server-info-page-1.5.tar.gz /abrt-server-info-page-1.6.tar.gz +/abrt-server-info-page-1.7.tar.gz diff --git a/abrt-server-info-page.spec b/abrt-server-info-page.spec index 964a67e..c33f8d3 100644 --- a/abrt-server-info-page.spec +++ b/abrt-server-info-page.spec @@ -1,7 +1,16 @@ +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +# Build python3 +%global with_python3 1 +%global PYTHONDIR %{python3_sitelib} +%else +%global with_python3 0 +%global PYTHONDIR %{python2_sitelib} +%endif + Summary: Web page with summary of ABRT services Name: abrt-server-info-page -Version: 1.6 -Release: 3%{?dist} +Version: 1.7 +Release: 1%{?dist} License: GPLv3+ URL: https://github.com/marusak/abrt-server-info-page # source is created by: @@ -11,11 +20,15 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch +%if 0%{?with_python3} +BuildRequires: python3-devel +%else BuildRequires: python2-devel +%endif -%if 0%{?rhel} > 7 || 0%{?fedora} > 27 -Requires: python2-flask >= 0.10 -Requires: python2-mod_wsgi +%if 0%{?with_python3} +Requires: python3-flask >= 0.10 +Requires: python3-mod_wsgi %else Requires: python-flask >= 0.10 Requires: mod_wsgi @@ -31,35 +44,34 @@ ABRT's products. %setup -q %install +sed -i "s|@PYTHONDIR@|%{PYTHONDIR}|g" config/abrt-server-info-page.conf mkdir -p %{buildroot} -mkdir -p %{buildroot}/%{python_sitelib}/abrt-server-info-page/static -mkdir -p %{buildroot}/%{python_sitelib}/abrt-server-info-page/static/js -mkdir -p %{buildroot}/%{python_sitelib}/abrt-server-info-page/static/css -mkdir -p %{buildroot}/%{python_sitelib}/abrt-server-info-page/static/fonts -mkdir -p %{buildroot}/%{python_sitelib}/abrt-server-info-page/templates +mkdir -p %{buildroot}/%{PYTHONDIR}/abrt-server-info-page/static +mkdir -p %{buildroot}/%{PYTHONDIR}/abrt-server-info-page/static/js +mkdir -p %{buildroot}/%{PYTHONDIR}/abrt-server-info-page/static/css +mkdir -p %{buildroot}/%{PYTHONDIR}/abrt-server-info-page/static/fonts +mkdir -p %{buildroot}/%{PYTHONDIR}/abrt-server-info-page/templates mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d -cp -a abrt_server_info_page.py %{buildroot}/%{python_sitelib}/abrt-server-info-page -cp -a abrt_server_info_page.wsgi %{buildroot}/%{python_sitelib}/abrt-server-info-page -cp -a config.py %{buildroot}/%{python_sitelib}/abrt-server-info-page +cp -a abrt_server_info_page.py %{buildroot}/%{PYTHONDIR}/abrt-server-info-page +cp -a abrt_server_info_page.wsgi %{buildroot}/%{PYTHONDIR}/abrt-server-info-page +cp -a config.py %{buildroot}/%{PYTHONDIR}/abrt-server-info-page cp -a config/abrt-server-info-page.conf %{buildroot}/%{_sysconfdir}/httpd/conf.d/ -cp -a templates/index.html %{buildroot}/%{python_sitelib}/abrt-server-info-page/templates -cp -a static/* %{buildroot}/%{python_sitelib}/abrt-server-info-page/static +cp -a templates/index.html %{buildroot}/%{PYTHONDIR}/abrt-server-info-page/templates +cp -a static/* %{buildroot}/%{PYTHONDIR}/abrt-server-info-page/static %files %config(noreplace) %{_sysconfdir}/httpd/conf.d/abrt-server-info-page.conf -%{python2_sitelib}/abrt-server-info-page +%{PYTHONDIR}/abrt-server-info-page + %license LICENSE %post systemctl condrestart httpd %changelog -* Thu Jan 31 2019 Fedora Release Engineering - 1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - +* Thu Feb 07 2019 Martin Kutlak 1.7-1 +- Migrate to python3 for F28+ and RHEL8+ +- add releaser for f29 * Wed Apr 18 2018 Miroslav Suchý 1.6-1 - fix dependencies on F27- and RHEL (msuchy@redhat.com) @@ -85,4 +97,3 @@ systemctl condrestart httpd - Remove unused BuildRequires from specfile (marusak.matej@gmail.com) * Thu Jan 19 2017 Matej Marusak 1.1-1 - Initial package - diff --git a/sources b/sources index 55dc1bc..796cf74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-server-info-page-1.6.tar.gz) = a37c216ae8d9b2cc846b0fec7736409d87765eb500096bc847c91a9c2bb087c439e7e7ae1b2d1e2ce592ed0ed12d1eb7523cccf4c44e2eda9170d42b40940764 +SHA512 (abrt-server-info-page-1.7.tar.gz) = ea32bb30116182df75297e6de8358ff1315c0d88fbcfd6d46c806af0212936086379c044af9038222e61b03bbabd5a32059261de6e5349d1371e422cf93b307f