[nemo-systemsettings] Remove vpn-updown script and service. Contribut…

…es to JB#41460
sailfishos · Apr 4, 2018 · 3ab5248 · 3ab5248
1 parent f44b489
commit 3ab5248
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 43 deletions.
diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/rpm/nemo-qml-plugin-systemsettings.spec
@@ -56,7 +56,6 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 %qmake5_install
-chmod +x %{buildroot}/%{_bindir}/vpn-updown.sh
 
 %post -p /sbin/ldconfig
 
@@ -67,8 +66,6 @@ chmod +x %{buildroot}/%{_bindir}/vpn-updown.sh
 %{_libdir}/qt5/qml/org/nemomobile/systemsettings/libnemosystemsettings.so
 %{_libdir}/qt5/qml/org/nemomobile/systemsettings/qmldir
 %{_libdir}/libsystemsettings.so.*
-%{_libdir}/systemd/user/vpn-updown.service
-%{_bindir}/vpn-updown.sh
 %dir %attr(0775, root, privileged) /etc/location
 %config %attr(0664, root, privileged) /etc/location/location.conf
 

diff --git a/src/src.pro b/src/src.pro
@@ -91,12 +91,6 @@ pkgconfig.path = $$target.path/pkgconfig
 locationconfig.files = $$PWD/location.conf
 locationconfig.path = /etc/location
 
-scripts.path = /usr/bin/
-scripts.files = vpn-updown.sh
-
-servicefiles.path = /usr/lib/systemd/user/
-servicefiles.files = vpn-updown.service
-
 QMAKE_PKGCONFIG_NAME = lib$$TARGET
 QMAKE_PKGCONFIG_VERSION = $$VERSION
 QMAKE_PKGCONFIG_DESCRIPTION = System settings application development files
@@ -105,4 +99,4 @@ QMAKE_PKGCONFIG_INCDIR = $$develheaders.path
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5DBus profile nemomodels-qt5 libsailfishkeyprovider connman-qt5
 
-INSTALLS += target develheaders pkgconfig scripts servicefiles locationconfig
+INSTALLS += target develheaders pkgconfig locationconfig
diff --git a/src/vpn-updown.service b/src/vpn-updown.service
diff --git a/src/vpn-updown.sh b/src/vpn-updown.sh