#1 Move the NetworkManager dispatcher script out of /etc
Opened a month ago by lkundrak. Modified 22 days ago
rpms/ lkundrak/elementary-capnet-assist lr/nm-dispatcher-dir  into  master

@@ -0,0 +1,35 @@ 

+ From 4bb3c21203c59d454004dd004aa4bf923c868b04 Mon Sep 17 00:00:00 2001

+ From: Lubomir Rintel <lkundrak@v3.sk>

+ Date: Thu, 22 Aug 2019 16:44:58 +0200

+ Subject: [PATCH] Move the NetworkManager dispatcher script out of /etc

+ 

+ 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.

+ ---

+  meson.build | 3 +--

+  1 file changed, 1 insertion(+), 2 deletions(-)

+ 

+ diff --git a/meson.build b/meson.build

+ index 2ca7474..d2e9a17 100644

+ --- a/meson.build

+ +++ b/meson.build

+ @@ -2,7 +2,6 @@ project(

+      'io.elementary.capnet-assist',

+      'vala', 'c',

+      version: '2.2.3',

+ -    default_options: 'sysconfdir=/etc'

+  )

+  

+  i18n = import('i18n')

+ @@ -36,5 +35,5 @@ subdir('po')

+  

+  install_data(

+      '90captive_portal_test',

+ -    install_dir: join_paths(get_option('sysconfdir'), 'NetworkManager', 'dispatcher.d')

+ +    install_dir: join_paths(get_option('prefix'), 'lib', 'NetworkManager', 'dispatcher.d')

+  )

+ -- 

+ 2.23.0

+ 

@@ -4,11 +4,12 @@ 

  Name:           elementary-capnet-assist

  Summary:        Captive Portal Assistant for elementary

  Version:        2.2.3

- Release:        2%{?dist}

+ Release:        3%{?dist}

  License:        GPLv3+

  

  URL:            https://github.com/elementary/%{srcname}

  Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

+ Patch0:         0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch

  

  BuildRequires:  desktop-file-utils

  BuildRequires:  gettext

@@ -25,7 +26,7 @@ 

  BuildRequires:  pkgconfig(gtk+-3.0)

  BuildRequires:  pkgconfig(webkit2gtk-4.0)

  

- Requires:       NetworkManager

+ Requires:       NetworkManager >= 1.20

  

  # capnet-assist was retired for f29+

  Provides:       capnet-assist = %{version}-%{release}

@@ -72,7 +73,7 @@ 

  

  %{_bindir}/%{appname}

  

- %{_sysconfdir}/NetworkManager/dispatcher.d/90captive_portal_test

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

  

  %{_datadir}/applications/%{appname}.desktop

  %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml

@@ -80,6 +81,9 @@ 

  

  

  %changelog

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

+ - Move the NetworkManager dispatcher script out of /etc

+ 

  * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

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.

That's good to know.

I think you forgot to git add the actual patch?

Also, upstream is currently deciding whether to modify or drop the file altogether, so the next version will probably change this anyway.

rebased onto 0807962

23 days ago

I think you forgot to git add the actual patch?

Yes. Sorry. Updated now.

Also, upstream is currently deciding whether to modify or drop the file altogether, so the next version will probably change this anyway.

Cool

I asked upstream whether I can remove the dispatcher script altogether, since the functionality might have been moved elsewhere in the meantime.

https://github.com/elementary/capnet-assist/issues/3

If it's still required, I will merge your PR. If not, I'll just remove the file in packaging.