diff options
author | Konstantin Pavlov <thresh@nginx.com> | 2022-09-13 13:17:16 +0400 |
---|---|---|
committer | Konstantin Pavlov <thresh@nginx.com> | 2022-09-13 13:17:16 +0400 |
commit | ce964aa30b163e2b3263c5af57c1a6dae7d0cebb (patch) | |
tree | 26bf70c1a5991f6471fc4caed8628e068fdc0b7b /pkg/rpm | |
parent | eba4c3c98fa1bf275d94df8c727f70692ae7eae1 (diff) | |
parent | 38bd7e76a134084ab95a4ee3125af1ccd7b35864 (diff) | |
download | unit-ce964aa30b163e2b3263c5af57c1a6dae7d0cebb.tar.gz unit-ce964aa30b163e2b3263c5af57c1a6dae7d0cebb.tar.bz2 |
Merged with the default branch.1.28.0-1
Diffstat (limited to 'pkg/rpm')
-rw-r--r-- | pkg/rpm/Makefile | 78 | ||||
-rw-r--r-- | pkg/rpm/Makefile.go | 11 | ||||
-rw-r--r-- | pkg/rpm/Makefile.perl | 4 | ||||
-rw-r--r-- | pkg/rpm/Makefile.php | 4 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python | 57 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python27 | 4 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python310 | 2 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python34 | 57 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python35 | 52 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python36 | 2 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python37 | 2 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python38 | 57 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python39 | 2 | ||||
-rw-r--r-- | pkg/rpm/Makefile.ruby | 6 | ||||
-rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 | 32 | ||||
-rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config | 16 | ||||
-rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config | 16 | ||||
-rw-r--r-- | pkg/rpm/unit.module.spec.in | 11 | ||||
-rw-r--r-- | pkg/rpm/unit.spec.in | 13 |
19 files changed, 7 insertions, 419 deletions
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index a360b36e..bbe44fe5 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -10,25 +10,15 @@ RELEASE ?= $(DEFAULT_RELEASE) PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com> -ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) -OSVER = centos6 -else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) +ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) OSVER = centos7 else ifeq ($(shell rpm --eval "%{?rhel}"), 8) OSVER = centos8 else ifeq ($(shell rpm --eval "%{?rhel}"), 9) OSVER = centos9 -else ifeq ($(shell rpm --eval "%{?amzn}"), 1) -OSVER = amazonlinux1 else ifeq ($(shell rpm --eval "%{?amzn}"), 2) OSVER = amazonlinux2 -else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1315 -a 0%{?suse_version} -lt 1330 -a 0%{?is_opensuse} -eq 1'`; echo $$?), 0) -OSVER = opensuse-leap -else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1330 -a 0%{?is_opensuse} -eq 1'`; echo $$?), 0) -OSVER = opensuse-tumbleweed -else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1315 -a 0%{?is_opensuse} -eq 0'`; echo $$?), 0) -OSVER = sles -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 26'`; echo $$?),0) +else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35'`; echo $$?),0) OSVER = fedora endif @@ -38,32 +28,16 @@ ifeq ($(OSVER), centos7) BUILD_DEPENDS_unit += which endif -ifeq ($(OSVER), amazonlinux1) -BUILD_DEPENDS_unit += system-rpm-config -endif - -ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) -BUILD_DEPENDS_unit += libxml2-tools libxslt1 libopenssl-devel -else ifneq (,$(findstring $(OSVER),amazonlinux2)) BUILD_DEPENDS_unit += libxml2 libxslt openssl11-devel else BUILD_DEPENDS_unit += libxml2 libxslt openssl-devel endif -endif BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= -ifeq ($(OSVER), centos6) -include Makefile.php -include Makefile.python -include Makefile.go -include Makefile.jsc-common -include Makefile.jsc8 -endif - ifeq ($(OSVER), centos7) include Makefile.php include Makefile.python27 @@ -96,18 +70,6 @@ include Makefile.jsc8 include Makefile.jsc11 endif -ifeq ($(OSVER), amazonlinux1) -include Makefile.php -include Makefile.python27 -include Makefile.python34 -include Makefile.python35 -include Makefile.python36 -include Makefile.go -include Makefile.perl -include Makefile.jsc-common -include Makefile.jsc8 -endif - ifeq ($(OSVER), amazonlinux2) include Makefile.php include Makefile.python27 @@ -118,45 +80,9 @@ include Makefile.jsc-common include Makefile.jsc8 endif -ifeq ($(OSVER), opensuse-leap) -include Makefile.python27 -include Makefile.python34 -include Makefile.go -include Makefile.perl -include Makefile.ruby -endif - -ifeq ($(OSVER), opensuse-tumbleweed) -include Makefile.php -include Makefile.python27 -include Makefile.python36 -include Makefile.go -include Makefile.perl -include Makefile.ruby -endif - -ifeq ($(OSVER), sles) -include Makefile.python27 -include Makefile.python34 -include Makefile.perl -endif - ifeq ($(OSVER), fedora) 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 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 -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 29'`; echo $$?),0) -include Makefile.python37 -else -include Makefile.python36 -endif include Makefile.go include Makefile.perl include Makefile.ruby diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go index a1421bee..aacbe2b9 100644 --- a/pkg/rpm/Makefile.go +++ b/pkg/rpm/Makefile.go @@ -15,28 +15,17 @@ MODULE_SOURCES_go= unit.example-go-app \ ifeq ($(OSVER), centos6) BUILD_DEPENDS_go= epel-release golang -else ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed)) -BUILD_DEPENDS_go= go1.9 else BUILD_DEPENDS_go= golang endif BUILD_DEPENDS+= $(BUILD_DEPENDS_go) -ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed)) define MODULE_DEFINITIONS_go BuildArch: noarch Requires: unit-devel == $(VERSION)-$(RELEASE)%{?dist}.ngx BuildRequires: $(BUILD_DEPENDS_go) -%define gopath /usr/share/go/contrib endef -else -define MODULE_DEFINITIONS_go -BuildArch: noarch -Requires: unit-devel == $(VERSION)-$(RELEASE)%{?dist}.ngx -BuildRequires: $(BUILD_DEPENDS_go) -endef -endif export MODULE_DEFINITIONS_go define MODULE_PREINSTALL_go diff --git a/pkg/rpm/Makefile.perl b/pkg/rpm/Makefile.perl index f59b7353..92440cfa 100644 --- a/pkg/rpm/Makefile.perl +++ b/pkg/rpm/Makefile.perl @@ -13,11 +13,7 @@ MODULE_INSTARGS_perl= perl-install MODULE_SOURCES_perl= unit.example-perl-app \ unit.example-perl-config -ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) -BUILD_DEPENDS_perl= perl -else BUILD_DEPENDS_perl= perl-devel perl-libs perl-ExtUtils-Embed -endif BUILD_DEPENDS+= $(BUILD_DEPENDS_perl) diff --git a/pkg/rpm/Makefile.php b/pkg/rpm/Makefile.php index 8f39efc0..0f5a10e5 100644 --- a/pkg/rpm/Makefile.php +++ b/pkg/rpm/Makefile.php @@ -13,11 +13,7 @@ MODULE_INSTARGS_php= php-install MODULE_SOURCES_php= unit.example-php-app \ unit.example-php-config -ifeq ($(OSVER), opensuse-tumbleweed) -BUILD_DEPENDS_php= php7-devel php7-embed -else BUILD_DEPENDS_php= php-devel php-embedded -endif BUILD_DEPENDS+= $(BUILD_DEPENDS_php) diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python deleted file mode 100644 index 334d62c1..00000000 --- a/pkg/rpm/Makefile.python +++ /dev/null @@ -1,57 +0,0 @@ -MODULES+= python -MODULE_SUFFIX_python= python - -MODULE_SUMMARY_python= Python module for NGINX Unit - -MODULE_VERSION_python= $(VERSION) -MODULE_RELEASE_python= 1 - -MODULE_CONFARGS_python= python -MODULE_MAKEARGS_python= python -MODULE_INSTARGS_python= python-install - -MODULE_SOURCES_python= unit.example-python-app \ - unit.example-python-config - -ifeq ($(shell rpm --eval "%{?amzn}"), 1) -BUILD_DEPENDS_python= python26-devel -else -BUILD_DEPENDS_python= python-devel -endif - -BUILD_DEPENDS+= $(BUILD_DEPENDS_python) - -define MODULE_PREINSTALL_python -%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python/examples/python-app -%{__install} -m 644 -p %{SOURCE100} \ - %{buildroot}%{_datadir}/doc/unit-python/examples/python-app/wsgi.py -%{__install} -m 644 -p %{SOURCE101} \ - %{buildroot}%{_datadir}/doc/unit-python/examples/unit.config -endef -export MODULE_PREINSTALL_python - -define MODULE_FILES_python -%{_libdir}/unit/modules/* -%{_libdir}/unit/debug-modules/* -endef -export MODULE_FILES_python - -define MODULE_POST_python -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python) 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_python diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 index 079a8512..3de5f634 100644 --- a/pkg/rpm/Makefile.python27 +++ b/pkg/rpm/Makefile.python27 @@ -13,9 +13,7 @@ MODULE_INSTARGS_python27= python2.7-install MODULE_SOURCES_python27= unit.example-python-app \ unit.example-python27-config -ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) -BUILD_DEPENDS_python27= python-devel -else ifneq (,$(findstring $(OSVER),fedora centos8)) +ifneq (,$(findstring $(OSVER),fedora centos8)) BUILD_DEPENDS_python27= python2-devel else ifneq (,$(findstring $(OSVER),centos7 amazonlinux2)) BUILD_DEPENDS_python27= python-devel diff --git a/pkg/rpm/Makefile.python310 b/pkg/rpm/Makefile.python310 index 82bc311a..50731475 100644 --- a/pkg/rpm/Makefile.python310 +++ b/pkg/rpm/Makefile.python310 @@ -13,7 +13,7 @@ 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)) +ifneq (,$(findstring $(OSVER),fedora amazonlinux2)) BUILD_DEPENDS_python310= python3-devel else BUILD_DEPENDS_python310= python310-devel diff --git a/pkg/rpm/Makefile.python34 b/pkg/rpm/Makefile.python34 deleted file mode 100644 index 83c0bdb6..00000000 --- a/pkg/rpm/Makefile.python34 +++ /dev/null @@ -1,57 +0,0 @@ -MODULES+= python34 -MODULE_SUFFIX_python34= python3.4 - -MODULE_SUMMARY_python34= Python 3.4 module for NGINX Unit - -MODULE_VERSION_python34= $(VERSION) -MODULE_RELEASE_python34= 1 - -MODULE_CONFARGS_python34= python --config=python3.4-config -MODULE_MAKEARGS_python34= python3.4 -MODULE_INSTARGS_python34= python3.4-install - -MODULE_SOURCES_python34= unit.example-python-app \ - unit.example-python34-config - -ifneq (,$(findstring $(OSVER),opensuse-leap sles)) -BUILD_DEPENDS_python34= python3-devel -else -BUILD_DEPENDS_python34= python34-devel -endif - -BUILD_DEPENDS+= $(BUILD_DEPENDS_python34) - -define MODULE_PREINSTALL_python34 -%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python34/examples/python-app -%{__install} -m 644 -p %{SOURCE100} \ - %{buildroot}%{_datadir}/doc/unit-python34/examples/python-app/wsgi.py -%{__install} -m 644 -p %{SOURCE101} \ - %{buildroot}%{_datadir}/doc/unit-python34/examples/unit.config -endef -export MODULE_PREINSTALL_python34 - -define MODULE_FILES_python34 -%{_libdir}/unit/modules/* -%{_libdir}/unit/debug-modules/* -endef -export MODULE_FILES_python34 - -define MODULE_POST_python34 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python34) 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_python34 diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35 deleted file mode 100644 index 6f866771..00000000 --- a/pkg/rpm/Makefile.python35 +++ /dev/null @@ -1,52 +0,0 @@ -MODULES+= python35 -MODULE_SUFFIX_python35= python3.5 - -MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit - -MODULE_VERSION_python35= $(VERSION) -MODULE_RELEASE_python35= 1 - -MODULE_CONFARGS_python35= python --config=python3.5-config -MODULE_MAKEARGS_python35= python3.5 -MODULE_INSTARGS_python35= python3.5-install - -MODULE_SOURCES_python35= unit.example-python-app \ - unit.example-python35-config - -BUILD_DEPENDS_python35= python35-devel -BUILD_DEPENDS+= $(BUILD_DEPENDS_python35) - -define MODULE_PREINSTALL_python35 -%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python35/examples/python-app -%{__install} -m 644 -p %{SOURCE100} \ - %{buildroot}%{_datadir}/doc/unit-python35/examples/python-app/wsgi.py -%{__install} -m 644 -p %{SOURCE101} \ - %{buildroot}%{_datadir}/doc/unit-python35/examples/unit.config -endef -export MODULE_PREINSTALL_python35 - -define MODULE_FILES_python35 -%{_libdir}/unit/modules/* -%{_libdir}/unit/debug-modules/* -endef -export MODULE_FILES_python35 - -define MODULE_POST_python35 -cat <<BANNER ----------------------------------------------------------------------- - -The $(MODULE_SUMMARY_python35) 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_python35 diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36 index 827d2253..c1fc8b6c 100644 --- a/pkg/rpm/Makefile.python36 +++ b/pkg/rpm/Makefile.python36 @@ -13,7 +13,7 @@ MODULE_INSTARGS_python36= python3.6-install MODULE_SOURCES_python36= unit.example-python-app \ unit.example-python36-config -ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora centos7)) +ifneq (,$(findstring $(OSVER),fedora centos7)) BUILD_DEPENDS_python36= python3-devel else BUILD_DEPENDS_python36= python36-devel diff --git a/pkg/rpm/Makefile.python37 b/pkg/rpm/Makefile.python37 index 563d4539..c0604fd9 100644 --- a/pkg/rpm/Makefile.python37 +++ b/pkg/rpm/Makefile.python37 @@ -13,7 +13,7 @@ MODULE_INSTARGS_python37= python3.7-install MODULE_SOURCES_python37= unit.example-python-app \ unit.example-python37-config -ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2)) +ifneq (,$(findstring $(OSVER),fedora amazonlinux2)) BUILD_DEPENDS_python37= python3-devel else BUILD_DEPENDS_python37= python37-devel diff --git a/pkg/rpm/Makefile.python38 b/pkg/rpm/Makefile.python38 deleted file mode 100644 index ffcca07f..00000000 --- a/pkg/rpm/Makefile.python38 +++ /dev/null @@ -1,57 +0,0 @@ -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/Makefile.python39 b/pkg/rpm/Makefile.python39 index 3f791111..5d7c2327 100644 --- a/pkg/rpm/Makefile.python39 +++ b/pkg/rpm/Makefile.python39 @@ -13,7 +13,7 @@ MODULE_INSTARGS_python39= python3.9-install MODULE_SOURCES_python39= unit.example-python-app \ unit.example-python39-config -ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2 centos9)) +ifneq (,$(findstring $(OSVER),fedora amazonlinux2 centos9)) BUILD_DEPENDS_python39= python3-devel else BUILD_DEPENDS_python39= python39-devel diff --git a/pkg/rpm/Makefile.ruby b/pkg/rpm/Makefile.ruby index 51c2949d..7fddc145 100644 --- a/pkg/rpm/Makefile.ruby +++ b/pkg/rpm/Makefile.ruby @@ -13,13 +13,7 @@ MODULE_INSTARGS_ruby= ruby-install MODULE_SOURCES_ruby= unit.example-ruby-app \ unit.example-ruby-config -ifeq ($(OSVER), opensuse-leap) -RACK_PACKAGE= ruby2.1-rubygem-rack -else ifeq ($(OSVER), opensuse-tumbleweed) -RACK_PACKAGE= ruby2.5-rubygem-rack -else RACK_PACKAGE= rubygem-rack -endif BUILD_DEPENDS_ruby= ruby-devel $(RACK_PACKAGE) BUILD_DEPENDS+= $(BUILD_DEPENDS_ruby) diff --git a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 b/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 deleted file mode 100644 index c7860e4b..00000000 --- a/pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 +++ /dev/null @@ -1,32 +0,0 @@ - - NGINX Unit. - - Copyright 2017-2022 NGINX, Inc. - Copyright 2017-2022 Valentin V. Bartenev - Copyright 2017-2022 Max Romanov - Copyright 2017-2022 Andrei Zeliankou - Copyright 2018-2022 Konstantin Pavlov - Copyright 2021-2022 Zhidao Hong - Copyright 2021-2022 OisÃn Canty - Copyright 2017-2021 Igor Sysoev - Copyright 2017-2021 Andrei Belov - Copyright 2019-2021 Tiago Natel de Moura - Copyright 2019-2020 Axel Duch - Copyright 2018-2019 Alexander Borisov - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - The unit-jsc10 package provides Java servlet container module - for NGINX Unit. - - Java is a registered trademark of Oracle and/or its affiliates. diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config deleted file mode 100644 index f9923a49..00000000 --- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config +++ /dev/null @@ -1,16 +0,0 @@ -{ - "applications": { - "example_python": { - "type": "python 3.5", - "processes": 2, - "path": "/usr/share/doc/unit-python35/examples/python-app", - "module": "wsgi" - } - }, - - "listeners": { - "*:8400": { - "pass": "applications/example_python" - } - } -} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config deleted file mode 100644 index c98d1a52..00000000 --- a/pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config +++ /dev/null @@ -1,16 +0,0 @@ -{ - "applications": { - "example_python": { - "type": "python 3.8", - "processes": 2, - "path": "/usr/share/doc/unit-python38/examples/python-app", - "module": "wsgi" - } - }, - - "listeners": { - "*:8400": { - "pass": "applications/example_python" - } - } -} diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 9b0f6221..88a1c33e 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -16,10 +16,6 @@ BuildRequires: openssl-devel %endif %endif -%if 0%{?suse_version} >= 1315 -BuildRequires: libopenssl-devel -%endif - %define unit_version %%UNIT_VERSION%% %define unit_release %%UNIT_RELEASE%%%{?dist}.ngx @@ -54,10 +50,6 @@ directly in the cloud / container environments and fully control your app dynamically via an API. This package contains %%SUMMARY%%. -%if 0%{?suse_version} -%debug_package -%endif - %if (0%{?fedora}) || (0%{?rhel} >= 8) %define _debugsource_template %{nil} %endif @@ -106,9 +98,6 @@ DESTDIR=%{buildroot} make %%MODULE_INSTARGS%% cd %{bdir} grep -v 'usr/src' debugfiles.list > debugfiles.list.new && mv debugfiles.list.new debugfiles.list cat /dev/null > debugsources.list -%if 0%{?suse_version} >= 1500 -cat /dev/null > debugsourcefiles.list -%endif %clean %{__rm} -rf %{buildroot} diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 4cbc7358..01c08bb8 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -17,10 +17,6 @@ BuildRequires: openssl-devel %endif %endif -%if 0%{?suse_version} >= 1315 -BuildRequires: libopenssl-devel -%endif - %define CC_OPT %{optflags} -fPIC %define LD_OPT -Wl,-z,relro -Wl,-z,now -pie @@ -59,10 +55,6 @@ in and out of the application. Take this application server and proxy directly in the cloud / container environments and fully control your app dynamically via an API. -%if 0%{?suse_version} -%debug_package -%endif - %if (0%{?fedora}) || (0%{?rhel} >= 8) %define _debugsource_template %{nil} %endif @@ -115,7 +107,6 @@ DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install %{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d %{__install} -m 644 -p %{SOURCE4} \ %{buildroot}%{_sysconfdir}/logrotate.d/unit -%{__mkdir} -p %{buildroot}%{_sysconfdir}/unit %{__mkdir} -p %{buildroot}%{_datadir}/doc/unit/examples %{__install} -m 644 -p %{SOURCE3} \ %{buildroot}%{_datadir}/doc/unit/examples/example.config @@ -143,9 +134,6 @@ cd %{bdir} && make tests && ./build/tests cd %{bdir} grep -v 'usr/src' debugfiles.list > debugfiles.list.new && mv debugfiles.list.new debugfiles.list cat /dev/null > debugsources.list -%if 0%{?suse_version} >= 1500 -cat /dev/null > debugsourcefiles.list -%endif %clean %{__rm} -rf %{buildroot} @@ -203,7 +191,6 @@ BANNER %defattr(-,root,root,-) %attr(0755,root,root) %{_sbindir}/unitd %attr(0755,root,root) %{_sbindir}/unitd-debug -%dir %{_sysconfdir}/unit %{_unitdir}/unit.service %{_unitdir}/unit-debug.service %dir %attr(0755,root,root) %ghost %{_localstatedir}/run/unit |