Merged with the default branch.1.5-1

13 files changed, 31 insertions, 13 deletions

diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 5eb4213d..ef7f3361 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -3,7 +3,7 @@
 DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \
 			| sed -e 's/^.*"\(.*\)".*/\1/')
 
-DEFAULT_RELEASE := 2
+DEFAULT_RELEASE := 1
 
 VERSION ?= $(DEFAULT_VERSION)
 RELEASE ?= $(DEFAULT_RELEASE)
diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go
index a5735c12..40ebf8fb 100644
--- a/pkg/rpm/Makefile.go
+++ b/pkg/rpm/Makefile.go
@@ -4,7 +4,7 @@ MODULE_SUFFIX_go=	go
 MODULE_SUMMARY_go=	Go module for NGINX Unit
 
 MODULE_VERSION_go=	$(VERSION)
-MODULE_RELEASE_go=	2
+MODULE_RELEASE_go=	1
 
 MODULE_CONFARGS_go=	go --go-path=%{gopath}
 MODULE_MAKEARGS_go=	go
diff --git a/pkg/rpm/Makefile.perl b/pkg/rpm/Makefile.perl
index fed66e58..90259e9e 100644
--- a/pkg/rpm/Makefile.perl
+++ b/pkg/rpm/Makefile.perl
@@ -4,7 +4,7 @@ MODULE_SUFFIX_perl=	perl
 MODULE_SUMMARY_perl=	Perl module for NGINX Unit
 
 MODULE_VERSION_perl=	$(VERSION)
-MODULE_RELEASE_perl=	2
+MODULE_RELEASE_perl=	1
 
 MODULE_CONFARGS_perl=	perl
 MODULE_MAKEARGS_perl=	perl
diff --git a/pkg/rpm/Makefile.php b/pkg/rpm/Makefile.php
index 1235777f..b4f093b7 100644
--- a/pkg/rpm/Makefile.php
+++ b/pkg/rpm/Makefile.php
@@ -4,7 +4,7 @@ MODULE_SUFFIX_php=	php
 MODULE_SUMMARY_php=	PHP module for NGINX Unit
 
 MODULE_VERSION_php=	$(VERSION)
-MODULE_RELEASE_php=	2
+MODULE_RELEASE_php=	1
 
 MODULE_CONFARGS_php=	php
 MODULE_MAKEARGS_php=	php
diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python
index e40ba6b8..0b0eb7bd 100644
--- a/pkg/rpm/Makefile.python
+++ b/pkg/rpm/Makefile.python
@@ -4,7 +4,7 @@ MODULE_SUFFIX_python=	python
 MODULE_SUMMARY_python=	Python module for NGINX Unit
 
 MODULE_VERSION_python=	$(VERSION)
-MODULE_RELEASE_python=	2
+MODULE_RELEASE_python=	1
 
 MODULE_CONFARGS_python=	python
 MODULE_MAKEARGS_python=	python
diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27
index c0c354d5..7d15bdd9 100644
--- a/pkg/rpm/Makefile.python27
+++ b/pkg/rpm/Makefile.python27
@@ -4,7 +4,7 @@ MODULE_SUFFIX_python27=	python2.7
 MODULE_SUMMARY_python27=	Python 2.7 module for NGINX Unit
 
 MODULE_VERSION_python27=	$(VERSION)
-MODULE_RELEASE_python27=	2
+MODULE_RELEASE_python27=	1
 
 MODULE_CONFARGS_python27=	python --config=python2.7-config
 MODULE_MAKEARGS_python27=	python2.7
diff --git a/pkg/rpm/Makefile.python34 b/pkg/rpm/Makefile.python34
index af37dea3..152007a2 100644
--- a/pkg/rpm/Makefile.python34
+++ b/pkg/rpm/Makefile.python34
@@ -4,7 +4,7 @@ MODULE_SUFFIX_python34=	python3.4
 MODULE_SUMMARY_python34=	Python 3.4 module for NGINX Unit
 
 MODULE_VERSION_python34=	$(VERSION)
-MODULE_RELEASE_python34=	2
+MODULE_RELEASE_python34=	1
 
 MODULE_CONFARGS_python34=	python --config=python3.4-config
 MODULE_MAKEARGS_python34=	python3.4
diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35
index 4837fc5d..3f075702 100644
--- a/pkg/rpm/Makefile.python35
+++ b/pkg/rpm/Makefile.python35
@@ -4,7 +4,7 @@ MODULE_SUFFIX_python35=	python3.5
 MODULE_SUMMARY_python35=	Python 3.5 module for NGINX Unit
 
 MODULE_VERSION_python35=	$(VERSION)
-MODULE_RELEASE_python35=	2
+MODULE_RELEASE_python35=	1
 
 MODULE_CONFARGS_python35=	python --config=python3.5-config
 MODULE_MAKEARGS_python35=	python3.5
diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36
index 7d80493a..fd55840e 100644
--- a/pkg/rpm/Makefile.python36
+++ b/pkg/rpm/Makefile.python36
@@ -4,7 +4,7 @@ MODULE_SUFFIX_python36=	python3.6
 MODULE_SUMMARY_python36=	Python 3.6 module for NGINX Unit
 
 MODULE_VERSION_python36=	$(VERSION)
-MODULE_RELEASE_python36=	2
+MODULE_RELEASE_python36=	1
 
 MODULE_CONFARGS_python36=	python --config=python3.6-config
 MODULE_MAKEARGS_python36=	python3.6
diff --git a/pkg/rpm/Makefile.ruby b/pkg/rpm/Makefile.ruby
index 3816d654..5702fb44 100644
--- a/pkg/rpm/Makefile.ruby
+++ b/pkg/rpm/Makefile.ruby
@@ -4,7 +4,7 @@ MODULE_SUFFIX_ruby=	ruby
 MODULE_SUMMARY_ruby=	Ruby module for NGINX Unit
 
 MODULE_VERSION_ruby=	$(VERSION)
-MODULE_RELEASE_ruby=	2
+MODULE_RELEASE_ruby=	1
 
 MODULE_CONFARGS_ruby=	ruby
 MODULE_MAKEARGS_ruby=	ruby
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config
index d6a2a8a0..079ce0b8 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-go-config
@@ -1,7 +1,7 @@
 {
 	"applications": {
 		"example_go": {
-			"type": "go",
+			"type": "external",
 			"user": "nobody",
 			"executable": "/tmp/go-app"
 		}
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example.config b/pkg/rpm/rpmbuild/SOURCES/unit.example.config
index a5f31ced..1715c971 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example.config
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example.config
@@ -17,7 +17,7 @@
 		},
 
 		"example_go": {
-			"type": "go",
+			"type": "external",
 			"user": "nobody",
 			"executable": "/tmp/go-app"
 		},
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index cdecaeac..e3523cb3 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -60,6 +60,14 @@ dynamically via an API.
 %debug_package
 %endif
 
+%package devel
+Summary: NGINX Unit (development files)
+Version: %%VERSION%%
+Release: %%RELEASE%%%{?dist}.ngx
+Group: Development/Libraries
+%description devel
+Library and include files required for NGINX Unit modules development.
+
 %prep
 %setup -q
 
@@ -67,14 +75,17 @@ dynamically via an API.
 ./configure \
 	%{CONFIGURE_ARGS} \
 	--modules=%{_libdir}/unit/debug-modules \
+	--libdir=%{_libdir} \
 	--cc-opt="%{CC_OPT}" \
 	--ld-opt="%{LD_OPT}" \
 	--debug
 %{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} build/libunit.a
 %{__mv} build build-debug
 ./configure \
 	%{CONFIGURE_ARGS} \
 	--modules=%{_libdir}/unit/modules \
+	--libdir=%{_libdir} \
 	--cc-opt="%{CC_OPT}" \
 	--ld-opt="%{LD_OPT}"
 %{__make} %{?_smp_mflags}
@@ -83,9 +94,11 @@ dynamically via an API.
 %install
 %{__rm} -rf %{buildroot}
 %{__ln_s} build-nodebug build
-DESTDIR=%{buildroot} make unitd-install
+DESTDIR=%{buildroot} make unitd-install libunit-install
 %{__install} -m755 %{bdir}/build-debug/unitd \
     %{buildroot}%{_sbindir}/unitd-debug
+%{__install} -m644 %{bdir}/build-debug/libunit.a \
+    %{buildroot}%{_libdir}/libunit-debug.a
 %{__mkdir} -p %{buildroot}%{_libdir}/unit/modules
 %{__mkdir} -p %{buildroot}%{_libdir}/unit/debug-modules
 %{__mkdir} -p %{buildroot}%{_sharedstatedir}/unit
@@ -184,4 +197,9 @@ fi
 %dir %{_libdir}/unit/debug-modules
 %dir %{_sharedstatedir}/unit
 
+%files devel
+%{_libdir}/libunit.a
+%{_libdir}/libunit-debug.a
+%{_includedir}/nxt_*.h
+
 %changelog