#1 Move the NetworkManager dispatcher script out of /etc
Closed 2 months ago by lkundrak. Opened 2 months ago by lkundrak.
rpms/ lkundrak/squid lr/nm-dispatcher-dir  into  master

file modified
+10 -4

@@ -2,7 +2,7 @@ 

  

  Name:     squid

  Version:  4.8

- Release:  3%{?dist}

+ Release:  4%{?dist}

  Summary:  The Squid proxy caching server

  Epoch:    7

  # See CREDITS for breakdown of non GPLv2+ code

@@ -64,6 +64,9 @@ 

  BuildRequires: pkgconfig(cppunit)

  BuildRequires: autoconf

  

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

+ Conflicts: NetworkManager < 1.20

+ 

  %description

  Squid is a high-performance proxy caching server for Web clients,

  supporting FTP, gopher, and HTTP data objects. Unlike traditional

@@ -172,7 +175,7 @@ 

  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig

  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d

  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/

- mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d

+ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d

  mkdir -p $RPM_BUILD_ROOT%{_unitdir}

  mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/squid

  install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squid

@@ -181,7 +184,7 @@ 

  install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}

  install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_libexecdir}/squid

  install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/squid.conf

- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-squid

+ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d/20-squid

  mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/squid

  mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/squid

  mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/squid

@@ -238,7 +241,7 @@ 

  

  %dir %{_datadir}/squid

  %attr(-,root,root) %{_datadir}/squid/errors

- %attr(755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/20-squid

+ %{_prefix}/lib/NetworkManager

  %{_datadir}/squid/icons

  %{_sbindir}/squid

  %{_bindir}/squidclient

@@ -286,6 +289,9 @@ 

  

  

  %changelog

+ * Thu Aug 22 2019 Lubomir Rintel <lkundrak@v3.sk> - 7:4.8-4

+ - Move the NetworkManager dispatcher script out of /etc

+ 

  * Mon Aug 05 2019 Lubos Uhliarik <luhliari@redhat.com> - 7:4.8-3

  - Resolves: #1737030 - depend on httpd-filesystem

  

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

2 months ago