diff --git a/netatalk.spec b/netatalk.spec index acfa4ad..4007cba 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -29,6 +29,7 @@ # set path to python binary per fedora packaging guidelines %if 0%{?rhel} && 0%{?rhel} <= 7 %global python_bin /usr/bin/python2 +%global with_python2 1 %else %global python_bin /usr/bin/python3 %endif @@ -36,7 +37,7 @@ Name: netatalk Epoch: 5 Version: 3.1.12 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Open Source Apple Filing Protocol(AFP) File Server License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT # Project is also mirrored at https://github.com/Netatalk/Netatalk @@ -81,7 +82,7 @@ BuildRequires: libtdb-devel %{!?with_bdb:BuildRequires: db4-devel} %{?with_libevent:BuildRequires: libevent-devel} %{?with_docbook:BuildRequires: libxslt} -%{?with_mysql:BuildRequires: mysql-devel} +%{?with_mysql:BuildRequires: mariadb-devel} %{?with_ldap:BuildRequires: openldap-devel} %{?with_procpsng:BuildRequires: procps-ng} %{!?with_procng:BuildRequires: procps} @@ -91,11 +92,8 @@ BuildRequires: libtdb-devel %{!?without_openafs:BuildRequires: openafs-devel} %{!?without_tcp_wrappers:BuildRequires: tcp_wrappers-devel} -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: dbus-python -%else -Requires: python3-dbus -%endif +%{?with_python2:Requires: dbus-python} +%{!?with_python2:Requires: python3-dbus} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %{?with_tracker:Requires: dconf} %{?ldconfig:Requires(post): %{ldconfig}} @@ -135,7 +133,7 @@ sed -i 's\-systemctl daemon-reload\\g' distrib/initscripts/Makefile.in --with-kerberos \ --with-libgcrypt \ --with-pam \ - --with-pkgconfdir=%{_sysconfdir}/netatalk/ \ + --with-pkgconfdir=%{_sysconfdir}/netatalk \ --with-shadow \ --with-tbd=no \ --with-uams-path=%{_libdir}/netatalk \ @@ -217,6 +215,11 @@ sh test/afpd/test.sh %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Oct 22 2019 Andrew Bauer - 5:3.1.12-10 +- build against mariadb-devel, rather than mysql-devel +- add with_python2 global +- remove trailing slash from pkgconfdir + * Mon Oct 21 2019 Miro HronĨok - 5:3.1.12-9 - Require Python 3 version of dbus-python on Fedora