[X2Go-Commits] [x2godesktopsharing] 03/13: Revert "x2godesktopsharing.spec: install system-wide configuration file, akin to Debian packages."

git-admin at x2go.org git-admin at x2go.org
Wed Nov 14 10:08:51 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit 0d31d88e52d56b5c08d29bf3a3d6272bf8790c93
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 14 10:06:03 2018 +0100

    Revert "x2godesktopsharing.spec: install system-wide configuration file, akin to Debian packages."
    
    This reverts commit 44d3f10b486091e1bce9e7cc3474e545984030e1.
---
 debian/changelog        | 1 -
 x2godesktopsharing.spec | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1b650a..91cafec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
     + Really fix the typo.
     + Completely rename to x2goserver-desktopsharing, drop name overrides.
     + Keep x2godesktopsharing name in most locations.
-    + Install system-wide configuration file, akin to Debian packages.
 
   [ Mike Gabriel ]
   * New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 5b864ab..30a9e2b 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -121,8 +121,6 @@ install -p -m 644 icons/16x16/%{my_name}.png %{buildroot}%{_datadir}/icons/hicol
 install -p -m 644 icons/64x64/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{my_name}.png
 install -p -m 644 icons/32x32/%{my_name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{my_name}.png
 install -p -m 755 bin/* %{buildroot}%{_bindir}/
-install -d -m 755 %{buildroot}%{_sysconfdir}/x2go/desktopsharing
-install -p -m 644 debian/settings %{buildroot}%{_sysconfdir}/x2go/desktopsharing
 cp -rp share/* %{buildroot}%{_datadir}/x2go/
 cp -rp man %{buildroot}%{_datadir}/
 %if 0%{?suse_version} && 0%{?suse_version} <= 1130
@@ -178,9 +176,6 @@ fi
 %{_mandir}/man8/x2goresume-desktopsharing.8.gz
 %{_mandir}/man8/x2gosuspend-desktopsharing.8.gz
 %{_mandir}/man8/x2goterminate-desktopsharing.8.gz
-%dir %{_sysconfdir}/x2go/
-%dir %{_sysconfdir}/x2go/desktopsharing
-%config(noreplace) %{_sysconfdir}/x2go/desktopsharing/settings
 
 
 %changelog

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git


More information about the x2go-commits mailing list