[X2Go-Commits] [x2goserver] 01/01: Spcial handling of x2gofm.desktop. In EPEL-5 the Encoding key is still required for .desktop files.
git-admin at x2go.org
git-admin at x2go.org
Tue Apr 1 11:49:19 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit 5c00642adeb2ea1c0ff9fddcc79ccad614b56820
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Apr 1 11:49:22 2014 +0200
Spcial handling of x2gofm.desktop. In EPEL-5 the Encoding key is still required for .desktop files.
---
debian/changelog | 2 ++
x2goserver.spec | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e126663..a4dd02d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low
x2gomountdirs.8.
* x2goserver.spec:
- Let builds for EPEL-7 behave like recent Fedora builds.
+ - Spcial handling of x2gofm.desktop. In EPEL-5 the Encoding key
+ is still required for .desktop files.
* debian/*.doc-base:
+ Provide *.doc-base files for bin:packages containing HTML man pages
or other documentation.
diff --git a/x2goserver.spec b/x2goserver.spec
index d95056d..989b260 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -205,7 +205,6 @@ sed -i -e 's/\t$(MAKE) -C x2goserver-pyhoca/#\t$(MAKE) -C x2goserver-pyhoca/g' M
# Don't try to be root
sed -i -e 's/-o root -g root//' */Makefile
-
%build
export PATH=%{_qt4_bindir}:$PATH
make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix}
@@ -243,6 +242,9 @@ install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver
%endif
%endif
+%if 0%{?el5}
+echo "Encoding=UTF-8" >> %{buildroot}%{_datadir}/applications/x2gofm.desktop
+%endif
desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list