Skip to content

Commit fcc38b9

Browse files
author
Istiak Ferdous
authored
don't rely on deb control file for rpm version (#3437)
1 parent 8404771 commit fcc38b9

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

src/deb/nginx/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: hestia-nginx
22
Package: hestia-nginx
33
Priority: optional
4-
Version: 1.23.3-3
4+
Version: 1.23.4
55
Section: admin
66
Maintainer: HestiaCP <info@hestiacp.com>
77
Homepage: https://www.hestiacp.com

src/hst_autocompile.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,14 @@ if [ "$dontinstalldeps" != 'true' ]; then
246246
# Install needed software
247247
if [ "$OSTYPE" = 'rhel' ]; then
248248
# Set package dependencies for compiling
249-
SOFTWARE='gcc gcc-c++ make libxml2-devel zlib-devel libzip-devel gmp-devel libcurl-devel gnutls-devel unzip openssl openssl-devel pkg-config sqlite-devel oniguruma-devel rpm-build wget tar git curl perl-IPC-Cmd'
249+
SOFTWARE='gcc gcc-c++ make libxml2-devel zlib-devel libzip-devel gmp-devel libcurl-devel gnutls-devel unzip openssl openssl-devel pkg-config sqlite-devel oniguruma-devel rpm-build wget tar git curl perl-IPC-Cmd perl-File-Copy-Recursive perl-FindBin perl-File-Compare'
250250

251251
echo "Updating system DNF repositories..."
252252
dnf install -y -q 'dnf-command(config-manager)'
253-
dnf install -y -q dnf-plugins-core
253+
dnf install -y -q dnf-plugins-core epel-release
254254
dnf config-manager --set-enabled powertools > /dev/null 2>&1
255255
dnf config-manager --set-enabled PowerTools > /dev/null 2>&1
256+
dnf config-manager --set-enabled crb > /dev/null 2>&1
256257
dnf upgrade -y -q
257258
echo "Installing dependencies for compilation..."
258259
dnf install -y -q $SOFTWARE

src/rpm/hestia/hestia.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
%global _hardened_build 1
2+
13
Name: hestia
2-
Version: %HESTIA-VERSION%
3-
Release: 1%{dist}
4+
Version: 1.7.2
5+
Release: 1~alpha%{dist}
46
Summary: Hestia Control Panel
57
Group: System Environment/Base
68
License: GPLv3

src/rpm/nginx/hestia-nginx.spec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
%global _hardened_build 1
2+
13
Name: hestia-nginx
2-
Version: %HESTIA-NGINX-VERSION%
4+
Version: 1.23.4
35
Release: 1%{dist}
46
Summary: Hestia internal nginx web server
57
Group: System Environment/Base

src/rpm/php/hestia-php.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
%global _hardened_build 1
2+
13
Name: hestia-php
2-
Version: %HESTIA-PHP-VERSION%
4+
Version: 8.2.4
35
Release: 1%{dist}
46
Summary: Hestia internal PHP
57
Group: System Environment/Base
@@ -39,7 +41,7 @@ mkdir -p %{buildroot}%{_unitdir}
3941
%defattr(-,root,root)
4042
%attr(755,root,root) /usr/local/hestia/php
4143
%attr(775,admin,admin) /usr/local/hestia/php/var/log
42-
%attr(775,admin,admin) /usr/local/hestia/php/run
44+
%attr(775,admin,admin) /usr/local/hestia/php/var/run
4345
%config(noreplace) /usr/local/hestia/php/etc/php-fpm.conf
4446
%config(noreplace) /usr/local/hestia/php/lib/php.ini
4547
%{_unitdir}/hestia-php.service

0 commit comments

Comments
 (0)