[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-301-gb4eec1f
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:53:37 CET 2014
The branch, build-baikal has been updated
via b4eec1fc03ae27b7b95597d9a327681ffbe53dfa (commit)
from 937723e0a9c2461d94fb9acfefc38a9d24b0efb4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver.spec | 10 +++-------
2 files changed, 4 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fc443f8..a194100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
perl-X2Go-Server-DB on postinst.
+ Set buildroot if we build for EPEL-5.
+ Use deprected %{_initrddir} macro for EPEL-5 builds.
+ + Take advantage of native RHEL support (since 4.0.1.10).
[ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
* New upstream version (4.1.0.0):
diff --git a/x2goserver.spec b/x2goserver.spec
index 4f780a9..3c9a51c 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -265,7 +265,7 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%
%install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
# Make sure the .packlist file is removed from %{perl_vendorarch}...
rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist
@@ -313,23 +313,19 @@ exit 0
%if 0%{?fedora}
%systemd_post x2goserver.service
-
%preun
%systemd_preun x2goserver.service
-
%postun
%systemd_postun x2goserver.service
%else
/sbin/chkconfig --add x2goserver
-
%postun
if [ "$1" -ge "1" ] ; then
/sbin/service x2goserver condrestart >/dev/null 2>&1 || :
fi
-
%preun
if [ "$1" = 0 ]; then
/sbin/service x2goserver stop >/dev/null 2>&1
@@ -462,10 +458,10 @@ exit 0
%files xsession
-%config(noreplace) %{_sysconfdir}/x2go/Xsession.options
+%{_sysconfdir}/x2go/xinitrc.d
+%{_sysconfdir}/x2go/Xclients.d
%{_sysconfdir}/x2go/Xresources
%config(noreplace) %{_sysconfdir}/x2go/Xsession
-%{_sysconfdir}/x2go/Xsession.d
%{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features
%{_datadir}/x2go/versions/VERSION.x2goserver-xsession
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list