#2 Move the NetworkManager dispatcher script out of /etc
Closed 22 days ago by lkundrak. Opened a month ago by lkundrak.
rpms/ lkundrak/sendmail lr/nm-dispatcher-dir  into  master

file modified
+9 -4

@@ -19,7 +19,7 @@ 

  Summary: A widely used Mail Transport Agent (MTA)

  Name: sendmail

  Version: 8.15.2

- Release: 39%{?dist}

+ Release: 40%{?dist}

  License: Sendmail

  URL: http://www.sendmail.org/

  

@@ -121,6 +121,8 @@ 

  %if "%{with_ldap}" == "yes"

  BuildRequires: openldap-devel openssl-devel

  %endif

+ # Old NetworkManager expects the dispatcher scripts in a different place

+ Conflicts: NetworkManager < 1.20

  

  

  %description

@@ -302,7 +304,7 @@ 

  	%{_docdir}/sendmail %{sendmailcf} %{_sysconfdir}/smrsh\

  	%{spooldir}/clientmqueue %{_sysconfdir}/sysconfig %{_initrddir} \

  	%{_sysconfdir}/pam.d %{_docdir}/sendmail/contrib \

- 	%{_sysconfdir}/NetworkManager/dispatcher.d

+ 	%{_prefix}/lib/NetworkManager/dispatcher.d

  do

  	install -m 755 -d %{buildroot}$d

  done

@@ -415,7 +417,7 @@ 

  touch %{buildroot}%{spooldir}/clientmqueue/sm-client.st

  

  install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/sendmail

- install -p -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/10-sendmail

+ install -p -m 755 %{SOURCE2} %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/10-sendmail

  install -p -m 755 %{SOURCE3} %{buildroot}%{maildir}/make

  install -p -m 644 %{SOURCE5} %{buildroot}%{maildir}/Makefile

  

@@ -662,7 +664,7 @@ 

  %{_unitdir}/sm-client.service

  %config(noreplace) %{_sysconfdir}/sysconfig/sendmail

  %config(noreplace) %{_sysconfdir}/pam.d/smtp.sendmail

- %{_sysconfdir}/NetworkManager/dispatcher.d/10-sendmail

+ %{_prefix}/lib/NetworkManager

  

  %if "%{with_sasl2}" == "yes"

  %config(noreplace) %{_sysconfdir}/sasl2/Sendmail.conf

@@ -705,6 +707,9 @@ 

  

  

  %changelog

+ * Thu Aug 22 2019 Lubomir Rintel <lkundrak@v3.sk> - 8.15.2-40

+ - Move the NetworkManager dispatcher script out of /etc

+ 

  * Fri Aug  2 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 8.15.2-39

  - Used gethostbyname2 instead of gethostbyname to fix FTBFS caused by

    glibc update dropping support for obsolete RES_USE_INET6

It's not user configuration and shouldn't ever have been there. Except for that
it used to be the only location NetworkManager looked into. With NetworkManager
1.20 that is no longer the case and the dispatcher scripts can be moved to
/usr/lib.

Merging with the provenpackager hat on.

Pull-Request has been closed by lkundrak

22 days ago