From 11f416878a9f5f7ec13d548b85982c5de5b55a11 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Fri, 4 Nov 2022 13:55:16 +0400
Subject: Packages: added Python 3.8 and Python 3.9 modules on RHEL 8 clones.
 Refs: https://github.com/nginx/unit/issues/778

---
 pkg/rpm/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkg/rpm/Makefile')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index bbe44fe5..ef824c65 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -53,6 +53,8 @@ ifeq ($(OSVER), centos8)
 include Makefile.php
 include Makefile.python27
 include Makefile.python36
+include Makefile.python38
+include Makefile.python39
 include Makefile.go
 include Makefile.perl
 include Makefile.jsc-common
-- 
cgit 


From 0feab91c5ba1bfd3e1e71cadb4cb0687bae846cd Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 16 Nov 2022 17:06:42 +0400
Subject: Packages: added Fedora 37 support.

---
 pkg/rpm/Makefile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'pkg/rpm/Makefile')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index ef824c65..a1ac2af9 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -18,8 +18,10 @@ else ifeq ($(shell rpm --eval "%{?rhel}"), 9)
 OSVER = centos9
 else ifeq ($(shell rpm --eval "%{?amzn}"), 2)
 OSVER = amazonlinux2
-else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35'`; echo $$?),0)
+else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35 -a 0%{?fedora} -le 36'`; echo $$?),0)
 OSVER = fedora
+else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 37'`; echo $$?),0)
+OSVER = fedora37
 endif
 
 BUILD_DEPENDS_unit = gcc rpm-build rpmlint
@@ -93,6 +95,17 @@ include Makefile.jsc8
 include Makefile.jsc11
 endif
 
+ifeq ($(OSVER), fedora37)
+include Makefile.php
+include Makefile.python311
+include Makefile.go
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc8
+include Makefile.jsc11
+endif
+
 CONFIGURE_ARGS=\
 	--prefix=/usr \
 	--state=%{_sharedstatedir}/unit \
-- 
cgit 


From 24e3f171029da265ee8cc20fe1a8846a0b49cb43 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 7 Dec 2022 18:20:44 -0800
Subject: Packages: added njs support.

---
 pkg/rpm/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'pkg/rpm/Makefile')

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index a1ac2af9..d00a25ac 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -106,7 +106,7 @@ include Makefile.jsc8
 include Makefile.jsc11
 endif
 
-CONFIGURE_ARGS=\
+CONFIGURE_ARGS_COMMON=\
 	--prefix=/usr \
 	--state=%{_sharedstatedir}/unit \
 	--control="unix:/var/run/unit/control.sock" \
@@ -118,6 +118,10 @@ CONFIGURE_ARGS=\
 	--tests \
 	--openssl
 
+CONFIGURE_ARGS=\
+	$(CONFIGURE_ARGS_COMMON) \
+	--njs
+
 export CR=\\n
 
 default:
@@ -176,7 +180,7 @@ endif
 rpmbuild/SOURCES/unit-$(VERSION).tar.gz:
 	cd ../.. && tar -czf pkg/rpm/rpmbuild/SOURCES/unit-$(VERSION).tar.gz \
 		--transform "s#^#unit-$(VERSION)/#" \
-		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go docs/man/unitd.8.in
+		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go pkg/contrib docs/man/unitd.8.in
 
 unit: check-build-depends-unit rpmbuild/SPECS/unit.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz
 	@echo "===> Building $@ package" ; \
@@ -212,7 +216,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil
 		-e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
 		-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
 		-e "s#%%MODULE_SOURCES%%#$${sources}#g" \
-		-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
+		-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS_COMMON)#g" \
 		-e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \
 		-e "s#%%MODULE_MAKEARGS%%#$(MODULE_MAKEARGS_$*)#g" \
 		-e "s#%%MODULE_INSTARGS%%#$(MODULE_INSTARGS_$*)#g" \
-- 
cgit