diff --git a/netatalk.spec b/netatalk.spec index 4007cba..13b8c43 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -37,7 +37,7 @@ Name: netatalk Epoch: 5 Version: 3.1.12 -Release: 10%{?dist} +Release: 11%{?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 @@ -100,6 +100,9 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $ve %{?ldconfig:Requires(postun): %{ldconfig}} %{?systemd_requires} +# Netatalk /usr/bin/dbd binary conflicts with binary of the same name in jday package +Conflicts: jday + %description Netatalk is a freely-available Open Source AFP file server. A *NIX/*BSD system running Netatalk is capable of serving many Macintosh clients @@ -170,6 +173,7 @@ install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/netatalk install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf find %{buildroot} -name '*.la' -delete -print + # Fix python shebang sed -i 's\^#!/usr/bin/env python$\#!%{python_bin}\' %{buildroot}/usr/bin/afpstats @@ -215,6 +219,9 @@ sh test/afpd/test.sh %{_mandir}/man*/netatalk-config.1* %changelog +* Tue Oct 22 2019 Andrew Bauer - 5:3.1.12-11 +- conflicts with jday + * Tue Oct 22 2019 Andrew Bauer - 5:3.1.12-10 - build against mariadb-devel, rather than mysql-devel - add with_python2 global