update to 1.30.0

add unitc and setup-unit commands

1 files changed, 18 insertions, 9 deletions

diff --git a/unit.spec b/unit.spec
index ed21c43..283a32e 100644
--- a/unit.spec
+++ b/unit.spec
@@ -11,12 +11,12 @@
 
 %global gh_owner    nginx
 %global project     unit
-%global gh_commit   32f9c3d6f9a97875b901357e2fc7a39010450d2c
+%global gh_commit   fcf1628b2c2014fab0ce227aab160bc61bc8d535
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 
 Name:              unit
 Summary:           NGINX Unit application server
-Version:           1.29.1
+Version:           1.30.0
 Release:           1%{?dist}
 License:           Apache-2.0
 URL:               https://unit.nginx.org/
@@ -71,11 +71,11 @@ unitconf() {
 ./configure \
   --libdir=%{_libdir} \
   --prefix=%{_prefix} \
-  --state=%{_sharedstatedir}/unit \
+  --statedir=%{_sharedstatedir}/unit \
   --control="unix:/run/unit/control.sock" \
   --pid=/run/unit/unit.pid \
   --log=/var/log/unit/unit.log \
-  --tmp=/var/tmp \
+  --tmpdir=/var/tmp \
   --user=unit \
   --group=unit \
   --openssl \
@@ -85,22 +85,25 @@ unitconf() {
 }
 
 unitconf \
-  --modules=%{_libdir}/unit/debug-modules \
+  --modulesdir=%{_libdir}/unit/debug-modules \
   --debug
 make %{?_smp_mflags}
-make %{?_smp_mflags} build/libunit.a
+make %{?_smp_mflags} build/lib/libunit.a
 mv build build-debug
 
 unitconf \
-  --modules=%{_libdir}/unit/modules
+  --modulesdir=%{_libdir}/unit/modules
 make %{?_smp_mflags}
 
 
 %install
 DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install
 
-install -m755 build-debug/unitd     %{buildroot}%{_sbindir}/unitd-debug
-install -m644 build-debug/libunit.a %{buildroot}%{_libdir}/libunit-debug.a
+install -m755 -D tools/unitc            %{buildroot}%{_bindir}/unitc
+install -m755 -D tools/setup-unit       %{buildroot}%{_bindir}/setup-unit
+
+install -m755 build-debug/sbin/unitd    %{buildroot}%{_sbindir}/unitd-debug
+install -m644 build-debug/lib/libunit.a %{buildroot}%{_libdir}/libunit-debug.a
 
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 mkdir -p %{buildroot}%{_libdir}/%{name}/modules
@@ -159,6 +162,8 @@ BANNER
 %license LICENSE
 %doc NOTICE CHANGES *.md
 %doc example.config
+%attr(0755,root,root) %{_bindir}/unitc
+%attr(0755,root,root) %{_bindir}/setup-unit
 %attr(0755,root,root) %{_sbindir}/unitd
 %attr(0755,root,root) %{_sbindir}/unitd-debug
 %dir %{_sysconfdir}/unit
@@ -182,6 +187,10 @@ BANNER
 
 
 %changelog
+* Thu May 11 2023 Remi Collet <remi@remirepo.net> - 1.30.0-1
+- update to 1.30.0
+- add unitc and setup-unit commands
+
 * Wed Mar  1 2023 Remi Collet <remi@remirepo.net> - 1.29.1-1
 - update to 1.29.1