[X2Go-Commits] [x2gokdrive] 01/01: x2gokdrive.spec: fix %exclude entry for protocol.txt, the new configure flags changed its path to %{_libexecdir}.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 0a9a564f22ab51e517cb6776c2471cfc0a5e858d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Oct 31 23:49:50 2019 +0100

    x2gokdrive.spec: fix %exclude entry for protocol.txt, the new configure flags changed its path to %{_libexecdir}.
---
 debian/changelog | 2 ++
 x2gokdrive.spec  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0607e2d..cb6f42a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -118,6 +118,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     + Port *.la file removal commenting from debian/rules.
     + Pull in pkgconfig(glproto) BR. Needed for *SuSE, that doesn't seem to
       pull it in by other means (while RHEL-land does).
+    + Fix %exclude entry for protocol.txt, the new configure flags changed its
+      path to %{_libexecdir}.
   * debian/rules:
     + Remove weird empty variable reference construct.
     + Whitespace-only fixes.
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index f9679a6..60e36ae 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -360,7 +360,9 @@ popd
 %files -n xorg-x11-server-x2gokdrive
 %defattr(-,root,root)
 %{_bindir}/x2gokdrive
-%exclude %{_libdir}/xorg/protocol.txt
+# Exclude protocol.txt, it's shipped by xorg-x11-server-common and we don't
+# want to conflict with that package.
+%exclude %{_libexecdir}/protocol.txt
 %exclude %{_mandir}/man1/Xserver.1.gz
 %exclude %{_var}/lib/xkb/
 %doc %{_mandir}/man1/x2gokdrive.1.gz

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