Merge 'dist/redhat: drop unnecessary variables and tags' from Kefu Chai

this is a cleanup in `scylla.spec`.

Closes scylladb/scylladb#16097

* github.com:scylladb/scylladb:
  dist/redhat: group sub-package preambles together
  dist/redhat: drop unused `defines` variable
  dist/redhat: remove tags for subpackage which are same as main preamble
This commit is contained in:
Botond Dénes
2023-11-20 11:46:56 +02:00

View File

@@ -57,28 +57,27 @@ This package installs all required packages for ScyllaDB, including
%prep
%setup -q -n scylla
%package server
Group: Applications/Databases
Summary: The Scylla database server
License: AGPLv3
URL: http://www.scylladb.com/
Requires: %{product}-conf = %{version}-%{release}
Requires: %{product}-python3 = %{version}-%{release}
AutoReqProv: no
%description server
This package contains ScyllaDB server.
%build
defines=()
%install
%if 0%{housekeeping}
install_arg="--housekeeping"
%endif
./install.sh --packaging --root "$RPM_BUILD_ROOT" $install_arg
%clean
rm -rf $RPM_BUILD_ROOT
%package server
Group: Applications/Databases
Summary: The Scylla database server
Requires: %{product}-conf = %{version}-%{release}
Requires: %{product}-python3 = %{version}-%{release}
AutoReqProv: no
%description server
This package contains ScyllaDB server.
%pre server
getent group scylla || /usr/sbin/groupadd scylla 2> /dev/null || :
getent passwd scylla || /usr/sbin/useradd -g scylla -s /sbin/nologin -r -d %{_sharedstatedir}/scylla scylla 2> /dev/null || :
@@ -106,9 +105,6 @@ if [ -d /tmp/%{name}-%{version}-%{release} ]; then
fi
ln -sfT /etc/scylla /var/lib/scylla/conf
%clean
rm -rf $RPM_BUILD_ROOT
%files server
%defattr(-,root,root)
@@ -156,8 +152,6 @@ rm -rf $RPM_BUILD_ROOT
%package conf
Group: Applications/Databases
Summary: Scylla configuration package
License: AGPLv3
URL: http://www.scylladb.com/
Obsoletes: scylla-server < 1.1
%description conf
@@ -203,8 +197,6 @@ fi
%package kernel-conf
Group: Applications/Databases
Summary: Scylla configuration package for the Linux kernel
License: AGPLv3
URL: http://www.scylladb.com/
Requires: kmod
# tuned overwrites our sysctl settings
Obsoletes: tuned >= 2.11.0