From 314ca5c8c9f9bb66e69278d84ab6d1b00b5b3599 Mon Sep 17 00:00:00 2001
From: Andrei Belov <defan@nginx.com>
Date: Tue, 19 Oct 2021 12:20:36 +0300
Subject: Packages: fixed dependency tracking for Go and Java modules on RHEL7.

---
 pkg/rpm/unit.module.spec.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkg/rpm')

diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index 4f096c73..9b0f6221 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -1,12 +1,12 @@
 # distribution specific definitions
 %define bdir %{_builddir}/%{name}-%{version}
 
-%%MODULE_DEFINITIONS%%
-
 %if (0%{?rhel} == 7 && 0%{?amzn} == 0)
 %define dist .el7
 %endif
 
+%%MODULE_DEFINITIONS%%
+
 %if 0%{?rhel}%{?fedora}
 BuildRequires: gcc
 %if 0%{?amzn2}
-- 
cgit 


From 28eaf9d37842a5d79d8081cc14fbf4cc7e7d49a5 Mon Sep 17 00:00:00 2001
From: Andrei Belov <defan@nginx.com>
Date: Fri, 12 Nov 2021 16:45:29 +0300
Subject: Packages: added support for Fedora 35.

---
 pkg/rpm/Makefile                                   |  4 +-
 pkg/rpm/Makefile.python310                         | 57 ++++++++++++++++++++++
 .../rpmbuild/SOURCES/unit.example-python310-config | 16 ++++++
 3 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 pkg/rpm/Makefile.python310
 create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config

(limited to 'pkg/rpm')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index e67846cf..011eba5b 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -134,7 +134,9 @@ include Makefile.php
 ifeq ($(shell test `rpm --eval '0%{?fedora} -lt 32'`; echo $$?),0)
 include Makefile.python27
 endif
-ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 33'`; echo $$?),0)
+ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35'`; echo $$?),0)
+include Makefile.python310
+else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 33'`; echo $$?),0)
 include Makefile.python39
 else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 32'`; echo $$?),0)
 include Makefile.python38
diff --git a/pkg/rpm/Makefile.python310 b/pkg/rpm/Makefile.python310
new file mode 100644
index 00000000..82bc311a
--- /dev/null
+++ b/pkg/rpm/Makefile.python310
@@ -0,0 +1,57 @@
+MODULES+=		python310
+MODULE_SUFFIX_python310=	python3.10
+
+MODULE_SUMMARY_python310=	Python 3.10 module for NGINX Unit
+
+MODULE_VERSION_python310=	$(VERSION)
+MODULE_RELEASE_python310=	1
+
+MODULE_CONFARGS_python310=	python --config=python3.10-config
+MODULE_MAKEARGS_python310=	python3.10
+MODULE_INSTARGS_python310=	python3.10-install
+
+MODULE_SOURCES_python310=	unit.example-python-app \
+			unit.example-python310-config
+
+ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2))
+BUILD_DEPENDS_python310=	python3-devel
+else
+BUILD_DEPENDS_python310=	python310-devel
+endif
+
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_python310)
+
+define MODULE_PREINSTALL_python310
+%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python310/examples/python-app
+%{__install} -m 644 -p %{SOURCE100} \
+    %{buildroot}%{_datadir}/doc/unit-python310/examples/python-app/wsgi.py
+%{__install} -m 644 -p %{SOURCE101} \
+    %{buildroot}%{_datadir}/doc/unit-python310/examples/unit.config
+endef
+export MODULE_PREINSTALL_python310
+
+define MODULE_FILES_python310
+%{_libdir}/unit/modules/*
+%{_libdir}/unit/debug-modules/*
+endef
+export MODULE_FILES_python310
+
+define MODULE_POST_python310
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python310) 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_python310
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config
new file mode 100644
index 00000000..8a73ca53
--- /dev/null
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python310-config
@@ -0,0 +1,16 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python 3.10",
+			"processes": 2,
+			"path": "/usr/share/doc/unit-python310/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"pass": "applications/example_python"
+		}
+	}
+}
-- 
cgit