Skip to content

Commit 5d2d26d

Browse files
authored
Merge pull request #5230 from sysown/v3.0.4-add_opensuse16
add opensuse16 packaging
2 parents 4915234 + bce71a9 commit 5d2d26d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux
319319
amd64-centos: centos9 centos9-clang centos9-dbg centos10 centos10-clang centos10-dbg
320320
amd64-debian: debian12 debian12-clang debian12-dbg debian13 debian13-clang debian13-dbg
321321
amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg fedora42 fedora42-clang fedora42-dbg
322-
amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
322+
amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg opensuse16 opensuse16-clang opensuse16-dbg
323323
amd64-ubuntu: ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
324324
amd64-pkglist:
325325
@${MAKE} -nk amd64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'
@@ -330,7 +330,7 @@ arm64-almalinux: almalinux8 almalinux9 almalinux10
330330
arm64-centos: centos9 centos10
331331
arm64-debian: debian12 debian13
332332
arm64-fedora: fedora40 fedora41 fedora42
333-
arm64-opensuse: opensuse15
333+
arm64-opensuse: opensuse15 opensuse16
334334
arm64-ubuntu: ubuntu22 ubuntu24
335335
arm64-pkglist:
336336
@${MAKE} -nk arm64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'

docker/images/proxysql/suse-compliant/rpmmacros/rpmbuild/SPECS/proxysql.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Source: %{name}-%{version}.tar.gz
1111
URL: https://proxysql.com/
1212
Requires: gnutls, (openssl >= 3.0.0 or openssl3 >= 3.0.0)
1313
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
14+
Provides: group(%{name})
1415

1516
%description
1617
%{summary}
@@ -23,6 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
2324
if [ -f /var/lib/%{name}/PROXYSQL_UPGRADE ]; then
2425
rm -fr /var/lib/%{name}/PROXYSQL_UPGRADE
2526
fi
27+
if ! id -u %{name} > /dev/null 2>&1; then useradd -r -U -s /bin/false -d /var/lib/%{name} -c "ProxySQL Server" %{name}; fi
2628

2729
%build
2830
# Packages are pre-built, nothing to do
@@ -40,7 +42,6 @@ fi
4042
# Create relevant user, directories and configuration files
4143
if [ ! -d /var/run/%{name} ]; then /bin/mkdir /var/run/%{name} ; fi
4244
if [ ! -d /var/lib/%{name} ]; then /bin/mkdir /var/lib/%{name} ; fi
43-
if ! id -u %{name} > /dev/null 2>&1; then useradd -r -U -s /bin/false -d /var/lib/%{name} -c "ProxySQL Server" %{name}; fi
4445
/bin/chown -R %{name}: /var/lib/%{name} /var/run/%{name}
4546
/bin/chown root:%{name} /etc/%{name}.cnf
4647
/bin/chmod 640 /etc/%{name}.cnf

0 commit comments

Comments
 (0)