From f2090bce21e4fb47d11f992a76ef5c4da74c3233 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Wed, 28 Feb 2018 09:31:38 +0000 Subject: Packages: added Fedora support. Tested on currently supported releases: Fedora 26, Fedora 27. --- pkg/rpm/Makefile | 10 ++++++++++ pkg/rpm/Makefile.python27 | 2 ++ pkg/rpm/Makefile.python36 | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'pkg/rpm') diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 0373a52d..718b475d 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -22,6 +22,8 @@ else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1330 -a 0%{?is_opensu 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) +OSVER = fedora endif BUILD_DEPENDS_unit = gcc rpm-build rpmlint @@ -82,6 +84,14 @@ include Makefile.python34 include Makefile.perl endif +ifeq ($(OSVER), fedora) +include Makefile.php +include Makefile.python27 +include Makefile.python36 +include Makefile.go +include Makefile.perl +endif + CONFIGURE_ARGS=\ --prefix=/usr \ --state=%{_sharedstatedir}/unit \ diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 index fe09bf1f..2464926a 100644 --- a/pkg/rpm/Makefile.python27 +++ b/pkg/rpm/Makefile.python27 @@ -15,6 +15,8 @@ MODULE_SOURCES_python27= unit.example-python-app \ ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) BUILD_DEPENDS_python27= python-devel +else ifeq ($(OSVER), fedora) +BUILD_DEPENDS_python27= python2-devel else BUILD_DEPENDS_python27= python27-devel endif diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36 index 05ab2334..940cee0e 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)) +ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora)) BUILD_DEPENDS_python36= python3-devel else BUILD_DEPENDS_python36= python36-devel -- cgit