From 0e38d1b82b3256be1bfb4c9f1e538ec15ccc0b70 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Thu, 23 Mar 2023 14:02:58 +0000 Subject: [PATCH] Remove remnants of CentOS/RHEL 7 packaging. --- pkg/redhat/README.md | 8 +-- pkg/redhat/pgadmin4-python-mod_wsgi.spec | 71 ------------------- .../pgadmin4-python3-mod_wsgi-exports.patch | 11 --- pkg/redhat/pgadmin4-python3-mod_wsgi.conf | 4 -- 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 pkg/redhat/pgadmin4-python-mod_wsgi.spec delete mode 100644 pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch delete mode 100644 pkg/redhat/pgadmin4-python3-mod_wsgi.conf diff --git a/pkg/redhat/README.md b/pkg/redhat/README.md index bf3e7d075..6e03646e2 100644 --- a/pkg/redhat/README.md +++ b/pkg/redhat/README.md @@ -6,8 +6,7 @@ Redhat distributions. ## Supported platforms * Fedora 36 & 37 -* RHEL 7 & 8 -* CentOS 7 +* RHEL 8 * Rocky Linux 8 (x86_64) * AlmaLinux/RHEL/Rocky Linux 9 (x86_64) @@ -47,11 +46,6 @@ The desktop runtime. Requires the server package. The server mode setup script for configuring Apache HTTPD. Requires the server package. -*pgadmin4-python3-mod_wsgi-4.7.1-2.el7..rpm* - -The Python 3 build of mod_wsgi for the Apache HTTPD server. Only built on -RHEL/CentOS 7. - ## Signing Packages It is good practice to sign RPMs to prove their provenance. The build scripts diff --git a/pkg/redhat/pgadmin4-python-mod_wsgi.spec b/pkg/redhat/pgadmin4-python-mod_wsgi.spec deleted file mode 100644 index a28996412..000000000 --- a/pkg/redhat/pgadmin4-python-mod_wsgi.spec +++ /dev/null @@ -1,71 +0,0 @@ -%global sname mod_wsgi - -%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}} - -%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}} -%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} -# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4 -%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}} -%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} - -%global debug_package %{nil} - -Name: pgadmin4-python3-%{sname} -Version: 4.9.0 -Release: 1%{?dist} -Summary: A WSGI interface for Python web applications in Apache (customized for pgAdmin4) -License: ASL 2.0 -URL: https://modwsgi.readthedocs.io/ -Source0: https://github.com/GrahamDumpleton/%{sname}/archive/%{version}.tar.gz#/mod_wsgi-%{version}.tar.gz -Source2: %{name}.conf -Patch1: %{name}-exports.patch - -Requires: httpd-mmn = %{_httpd_mmn} -BuildRequires: python3-devel -BuildRequires: httpd-devel -BuildRequires: gcc - -# Suppress auto-provides for module DSO -%{?filter_provides_in: %filter_provides_in %{_httpd_moddir}/.*\.so$} -%{?filter_setup} - -%global _description\ -The mod_wsgi adapter is an Apache module that provides a WSGI compliant\ -interface for hosting Python based web applications within Apache. The\ -adapter is written completely in C code against the Apache C runtime and\ -for hosting WSGI applications within Apache has a lower overhead than using\ -existing WSGI adapters for mod_python or CGI.\ - -%description %_description - -%prep -%autosetup -p1 -n %{sname}-%{version} - -%build -export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}" -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - -%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python3 -%{__make} %{?_smp_mflags} -%{_bindir}/python3 setup.py build - -%install -%{__make} install DESTDIR=%{buildroot} LIBEXECDIR=%{_httpd_moddir} -%{__install} -d -m 755 %{buildroot}%{_httpd_modconfdir} -%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_httpd_modconfdir}/10-pgadmin4-python3-mod_wsgi.conf -%{_bindir}/python3 setup.py install -O1 --skip-build --root %{buildroot} -%{__mv} %{buildroot}%{_httpd_moddir}/mod_wsgi.so %{buildroot}%{_httpd_moddir}/pgadmin4-python3-mod_wsgi.so -%{__mv} %{buildroot}%{_bindir}/mod_wsgi-express %{buildroot}%{_bindir}/pgadmin4-mod_wsgi-express-3 - -%files -%license LICENSE -%doc CREDITS.rst README.rst -%config(noreplace) %{_httpd_modconfdir}/*pgadmin4-python3-mod_wsgi.conf -%{_httpd_moddir}/pgadmin4-python3-mod_wsgi.so -%{python3_sitearch}/mod_wsgi-*.egg-info -%{python3_sitearch}/mod_wsgi -%{_bindir}/pgadmin4-mod_wsgi-express-3 - -%changelog -* Fri Mar 6 2020 Devrim Gündüz - 4.6.8-2 -- Initial packaging for the PostgreSQL YUM repository diff --git a/pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch b/pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch deleted file mode 100644 index 97e56714e..000000000 --- a/pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mod_wsgi-4.5.20/Makefile.in.exports -+++ mod_wsgi-4.5.20/Makefile.in -@@ -28,7 +28,7 @@ - all : src/server/mod_wsgi.la - - src/server/mod_wsgi.la : $(SRCFILES) -- $(APXS) -c $(CPPFLAGS) $(CFLAGS) $(SRCFILES) $(LDFLAGS) $(LDLIBS) -+ $(APXS) -Wl,-export-symbols-regex -Wl,wsgi_module -c $(CPPFLAGS) $(CFLAGS) $(SRCFILES) $(LDFLAGS) $(LDLIBS) - - $(DESTDIR)$(LIBEXECDIR) : - mkdir -p $@ diff --git a/pkg/redhat/pgadmin4-python3-mod_wsgi.conf b/pkg/redhat/pgadmin4-python3-mod_wsgi.conf deleted file mode 100644 index 1c3c3b226..000000000 --- a/pkg/redhat/pgadmin4-python3-mod_wsgi.conf +++ /dev/null @@ -1,4 +0,0 @@ - - LoadModule wsgi_module modules/pgadmin4-python3-mod_wsgi.so - -