From 22c917bead38df560bb112006d0b4a28aa8919d3 Mon Sep 17 00:00:00 2001
From: Andrei Belov <defan@nginx.com>
Date: Tue, 16 Jun 2020 15:02:29 +0300
Subject: Packages: added Fedora 32 support.

---
 pkg/rpm/Makefile                                   |  6 ++-
 pkg/rpm/Makefile.python38                          | 57 ++++++++++++++++++++++
 .../rpmbuild/SOURCES/unit.example-python38-config  | 17 +++++++
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 pkg/rpm/Makefile.python38
 create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config

(limited to 'pkg')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 8bc96d99..70100896 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -124,8 +124,12 @@ endif
 
 ifeq ($(OSVER), fedora)
 include Makefile.php
+ifeq ($(shell test `rpm --eval '0%{?fedora} -lt 32'`; echo $$?),0)
 include Makefile.python27
-ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 29'`; echo $$?),0)
+endif
+ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 32'`; echo $$?),0)
+include Makefile.python38
+else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 29'`; echo $$?),0)
 include Makefile.python37
 else
 include Makefile.python36
diff --git a/pkg/rpm/Makefile.python38 b/pkg/rpm/Makefile.python38
new file mode 100644
index 00000000..ffcca07f
--- /dev/null
+++ b/pkg/rpm/Makefile.python38
@@ -0,0 +1,57 @@
+MODULES+=		python38
+MODULE_SUFFIX_python38=	python3.8
+
+MODULE_SUMMARY_python38=	Python 3.8 module for NGINX Unit
+
+MODULE_VERSION_python38=	$(VERSION)
+MODULE_RELEASE_python38=	1
+
+MODULE_CONFARGS_python38=	python --config=python3.8-config
+MODULE_MAKEARGS_python38=	python3.8
+MODULE_INSTARGS_python38=	python3.8-install
+
+MODULE_SOURCES_python38=	unit.example-python-app \
+			unit.example-python38-config
+
+ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2))
+BUILD_DEPENDS_python38=	python3-devel
+else
+BUILD_DEPENDS_python38=	python38-devel
+endif
+
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_python38)
+
+define MODULE_PREINSTALL_python38
+%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python38/examples/python-app
+%{__install} -m 644 -p %{SOURCE100} \
+    %{buildroot}%{_datadir}/doc/unit-python38/examples/python-app/wsgi.py
+%{__install} -m 644 -p %{SOURCE101} \
+    %{buildroot}%{_datadir}/doc/unit-python38/examples/unit.config
+endef
+export MODULE_PREINSTALL_python38
+
+define MODULE_FILES_python38
+%{_libdir}/unit/modules/*
+%{_libdir}/unit/debug-modules/*
+endef
+export MODULE_FILES_python38
+
+define MODULE_POST_python38
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python38) has been installed.
+
+To check the sample app, run these commands:
+
+ sudo service unit start
+ cd /usr/share/doc/%{name}/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/unit/control.sock http://localhost/config
+ curl http://localhost:8400/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_python38
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config
new file mode 100644
index 00000000..25003869
--- /dev/null
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config
@@ -0,0 +1,17 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python 3.8",
+			"user": "nobody",
+			"processes": 2,
+			"path": "/usr/share/doc/unit-python38/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"pass": "applications/example_python"
+		}
+	}
+}
-- 
cgit