-
Notifications
You must be signed in to change notification settings - Fork 27
Description
Hello guys,
Would it be possible to clarify which rsyslog v8-stable spec file is actually used for building RPMS in Adiscon repository? In particular if you look at branch rsyslog-8.2102.0-release history, looks like only v8-stable-el7.spec was updated. So should we conclude el8 RPMS where built from it as well? Looking at the el8 src.rpm I know the answer is "yes" but I find it particularly confusing to keep both v8-stable-el7.spec and v8-stable.spec, especially since we can have conditions on the target in a spec file. I am probably missing something here so please correct me if I'm wrong, it's just that it makes contributing to this repo difficult and confusing.
In fact I would like to propose a change in build dependencies regarding the mysql subpackage (ommysql). The reason is that on your el8 build, rsyslog-mysql requires mysql because the build was linked with libmysqlclient. I have not quite checked the el7 build but both el7 and el8 you should not require mysql, mariadb libs should be fine. At the moment on el8 the build require to enable the mysql stream which I believe is not desirable since the orientation of the distro is to prefer mariadb. What do you think?
Here is how I believe we should do:
%package mysql
[...]
# mysql_config is required by rsyslog configure script
%if 0%{?rhel} >= 8
# on el8, mariadb-connector-c-devel contains mysql_config;
# dependencies install libs and headers; mysql is still available
# via stream but mariadb should be preferred.
BuildRequires: mariadb-connector-c-devel
%else
%if 0%{?rhel} == 7
# on el7, mariadb-devel (which provides mysql-devel) contains
# mysql_config; dependencies install libs and headers
BuildRequires: mariadb-devel
%else
%if 0%{?rhel} <= 6
# on el6, mysql contains the libs and mysql_config but does not
# depends on the headers so we need mysql-devel as well
BuildRequires: mysql
BuildRequires: mysql-devel
%endif
%endif
%endif
Cheers,
Julien