x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-266-g9acba84
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via 9acba84e5041b2acf715bb221184d674b63c5ecb (commit) from f42f18407a1f578cda599cce2810028b7eabebd1 (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 ----------------------------------------------------------------- commit 9acba84e5041b2acf715bb221184d674b63c5ecb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 14:02:08 2013 +0100 x2goclient.spec: Bring debian/control and x2goclient.spec in sync. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + debian/control | 90 ++----- debian/libx2go-server-perl.install | 5 +- debian/x2goserver-compat.docs | 1 - debian/x2goserver-compat.install | 2 - debian/x2goserver-compat.manpages | 1 - debian/x2goserver-pyhoca.dirs | 3 - debian/x2goserver-pyhoca.docs | 1 - debian/x2goserver-pyhoca.install | 3 - debian/x2goserver-pyhoca.manpages | 1 - x2goserver-compat/Makefile | 87 ------- x2goserver-compat/README.md | 16 -- x2goserver-compat/VERSION.x2goserver-compat | 1 - x2goserver-compat/bin/x2gosuspend | 24 -- x2goserver-compat/bin/x2gosuspend-agent | 30 --- x2goserver-compat/bin/x2goterminate | 30 --- x2goserver-compat/man/man8/x2gosuspend-agent.8 | 23 -- x2goserver-compat/man/man8/x2gosuspend.8 | 23 -- x2goserver-compat/man/man8/x2goterminate.8 | 23 -- .../share/x2gofeature.d/x2goserver-compat.features | 36 --- x2goserver-pyhoca/Makefile | 70 ----- x2goserver-pyhoca/README.md | 14 - x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 1 - .../share/x2gofeature.d/x2goserver-pyhoca.features | 35 --- x2goserver.spec | 271 +++++++++++++++++--- 25 files changed, 269 insertions(+), 524 deletions(-) delete mode 100644 debian/x2goserver-compat.docs delete mode 100644 debian/x2goserver-compat.install delete mode 100644 debian/x2goserver-compat.manpages delete mode 100644 debian/x2goserver-pyhoca.dirs delete mode 100644 debian/x2goserver-pyhoca.docs delete mode 100644 debian/x2goserver-pyhoca.install delete mode 100644 debian/x2goserver-pyhoca.manpages delete mode 100755 x2goserver-compat/Makefile delete mode 100644 x2goserver-compat/README.md delete mode 100644 x2goserver-compat/VERSION.x2goserver-compat delete mode 100755 x2goserver-compat/bin/x2gosuspend delete mode 100755 x2goserver-compat/bin/x2gosuspend-agent delete mode 100755 x2goserver-compat/bin/x2goterminate delete mode 100644 x2goserver-compat/man/man8/x2gosuspend-agent.8 delete mode 100644 x2goserver-compat/man/man8/x2gosuspend.8 delete mode 100644 x2goserver-compat/man/man8/x2goterminate.8 delete mode 100755 x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features delete mode 100755 x2goserver-pyhoca/Makefile delete mode 100644 x2goserver-pyhoca/README.md delete mode 100644 x2goserver-pyhoca/VERSION.x2goserver-pyhoca delete mode 100644 x2goserver-pyhoca/bin/.placeholder delete mode 100644 x2goserver-pyhoca/man/man8/.placeholder delete mode 100755 x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a337463..e5e69a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package to libx2go-server-db-perl and x2goserver-common). + * x2goclient.spec: + + Bring debian/control and x2goclient.spec in sync. [ Guangzhou Nianguan Electronics Technology Co.Ltd. ] * New upstream version (4.1.0.0): diff --git a/debian/control b/debian/control index f634227..9d3aa80 100644 --- a/debian/control +++ b/debian/control @@ -46,17 +46,19 @@ Recommends: x2goserver-printing (>= ${source:Version}), x2goserver-printing (<< ${source:Version}.1~), xfonts-base, Suggests: - x2goserver-compat (>= ${source:Version}), x2goserver-compat (<< ${source:Version}.1~), - x2goserver-pyhoca (>= ${source:Version}), x2goserver-pyhoca (<< ${source:Version}.1~), rdesktop, pulseaudio-utils Breaks: x2goserver-one, x2goserver-home, + x2goserver-compat, + x2goserver-pyhoca, Replaces: x2goserver-one, x2goserver-home, -Description: X2Go server daemon scripts + x2goserver-compat, + x2goserver-pyhoca, +Description: X2Go server X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -67,15 +69,6 @@ Description: X2Go server daemon scripts . This package contains the main daemon and tools for X2Go server-side session administrations. - . - The x2goserver package provides full functionality - for running the X2Go project's legacy X2Go client - (x2goclient) on the client-side. - . - However, if you intend using other client implementations - of X2Go make sure that you also have X2Go server - extensions package (x2goserver-extensions) installed. - Package: x2goserver-common Architecture: any @@ -176,7 +169,7 @@ Replaces: x2goprint Suggests: cups-x2go -Description: X2Go server daemon scripts (printing) +Description: X2Go server (printing support) X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -185,43 +178,26 @@ Description: X2Go server daemon scripts (printing) - audio support - authentication by smartcard and USB stick . - The X2Go server printing package provides + The X2Go Server printing package provides client-side printing support for X2Go. . - This package has to be installed on X2Go servers + This package has to be installed on X2Go Servers that shall be able to pass X2Go print jobs on to the X2Go client. . This package co-operates with the cups-x2go CUPS - backend. If CUPS server and X2Go server are hosted + backend. If CUPS server and X2Go Server are hosted on different machines, then make sure you install - this package on the X2Go server/s (and the cups-x2go + this package on the X2Go Server/s (and the cups-x2go package on the CUPS server). -Package: x2goserver-compat -Architecture: all -Depends: - ${misc:Depends}, - x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~) -Description: X2Go server daemon scripts (backwards compatitbity to old client versions) - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session brokerage support - - client side mass storage mounting support - - audio support - - authentication by smartcard and USB stick - . - This package contains compatitbility scripts to allow - old x2goclient versions to connect to your X2Go server. - Package: x2goserver-extensions Architecture: all Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-xkb-utils -Description: X2Go server daemon scripts (extensions) +Description: X2Go Server (extension support) X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -230,13 +206,12 @@ Description: X2Go server daemon scripts (extensions) - audio support - authentication by smartcard and USB stick . - The X2Go server extension namespace offers contributors - to add script functionality to X2Go that is not - needed/ignored by the legacy X2Go client (x2goclient). + The X2Go Server extension namespace offers contributors + to add script functionality to X2Go. . Make sure you have this package installed on your server - if you want non-legacy X2Go clients to be able to - access your server without lack of features. + if you want X2Go clients to be able to access your server + without lack of features. Package: x2goserver-xsession Architecture: all @@ -244,7 +219,7 @@ Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-common -Description: X2Go server daemon scripts (Xsession runner) +Description: X2Go Server (Xsession runner) X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -253,7 +228,7 @@ Description: X2Go server daemon scripts (Xsession runner) - audio support - authentication by smartcard and USB stick . - This X2Go server add-on enables Xsession script handling + This X2Go Server add-on enables Xsession script handling when starting desktop sessions with X2Go. . Amongst others the parsing of Xsession scripts will @@ -268,7 +243,7 @@ Depends: x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), desktop-file-utils, xdg-utils -Description: Generic (freedesktop-based) file manager bindings for X2Go +Description: X2Go Server (file manager bindings) X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -277,7 +252,7 @@ Description: Generic (freedesktop-based) file manager bindings for X2Go - audio support - authentication by smartcard and USB stick . - x2goserver-fmbindings contains generic MIME type information + This package contains generic MIME type information for X2Go's local folder sharing. It can be used with all freedesktop.org compliant desktop shells. . @@ -285,29 +260,6 @@ Description: Generic (freedesktop-based) file manager bindings for X2Go destkop binding components, if installed and being used with the corresponding desktop shell: - under LXDE by x2golxdebindings - - under GNOME by x2gognomebindings + - under GNOMEv2 by x2gognomebindings - under KDE4 by plasma-widget-x2go - -Package: x2goserver-pyhoca -Architecture: all -Depends: - ${misc:Depends}, - x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), -Description: X2Go server daemon scripts (add-ons for pyhoca client) - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - session brokerage support - - client side mass storage mounting support - - audio support - - authentication by smartcard and USB stick - . - This X2Go server add-on adds extra functionality when using - the pyhoca client (GUI or cmdline tool). The installation - of this package is completely optional, the pyhoca client - will work without. - . - Functionalities this package adds: - - renaming of session window titles - - setting detailled X keyboard parameters - + - under MATE by x2gomatebindings diff --git a/debian/libx2go-server-perl.install b/debian/libx2go-server-perl.install index 9b839db..e5eb159 100644 --- a/debian/libx2go-server-perl.install +++ b/debian/libx2go-server-perl.install @@ -2,4 +2,7 @@ usr/share/perl5/X2Go/Config.pm usr/share/perl5/X2Go/Server.pm usr/share/perl5/X2Go/SupeReNicer.pm usr/share/perl5/X2Go/Utils.pm -usr/share/man/man3/X2Go::Server.* \ No newline at end of file +usr/share/man/man3/X2Go::Config.* +usr/share/man/man3/X2Go::Server.* +usr/share/man/man3/X2Go::SuperReNicer.* +usr/share/man/man3/X2Go::Utils.* diff --git a/debian/x2goserver-compat.docs b/debian/x2goserver-compat.docs deleted file mode 100644 index 121edd8..0000000 --- a/debian/x2goserver-compat.docs +++ /dev/null @@ -1 +0,0 @@ -x2goserver-compat/.build_man2html/html diff --git a/debian/x2goserver-compat.install b/debian/x2goserver-compat.install deleted file mode 100644 index 5059ee2..0000000 --- a/debian/x2goserver-compat.install +++ /dev/null @@ -1,2 +0,0 @@ -x2goserver-compat/bin/x2go* /usr/bin/ -x2goserver-compat/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ diff --git a/debian/x2goserver-compat.manpages b/debian/x2goserver-compat.manpages deleted file mode 100644 index dc59c8c..0000000 --- a/debian/x2goserver-compat.manpages +++ /dev/null @@ -1 +0,0 @@ -x2goserver-compat/man/man8/* \ No newline at end of file diff --git a/debian/x2goserver-pyhoca.dirs b/debian/x2goserver-pyhoca.dirs deleted file mode 100644 index 45adc59..0000000 --- a/debian/x2goserver-pyhoca.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/x2go -usr/share/x2go/versions diff --git a/debian/x2goserver-pyhoca.docs b/debian/x2goserver-pyhoca.docs deleted file mode 100644 index 3a19506..0000000 --- a/debian/x2goserver-pyhoca.docs +++ /dev/null @@ -1 +0,0 @@ -#x2goserver-pyhoca/.build_man2html/html diff --git a/debian/x2goserver-pyhoca.install b/debian/x2goserver-pyhoca.install deleted file mode 100644 index 69985ca..0000000 --- a/debian/x2goserver-pyhoca.install +++ /dev/null @@ -1,3 +0,0 @@ -#x2goserver-pyhoca/bin/x2go* /usr/bin/ -x2goserver-pyhoca/VERSION.x2goserver-pyhoca /usr/share/x2go/versions/ -#x2goserver-pyhoca/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ diff --git a/debian/x2goserver-pyhoca.manpages b/debian/x2goserver-pyhoca.manpages deleted file mode 100644 index 6f35882..0000000 --- a/debian/x2goserver-pyhoca.manpages +++ /dev/null @@ -1 +0,0 @@ -#x2goserver-pyhoca/man/man8/* \ No newline at end of file diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile deleted file mode 100755 index b2cb141..0000000 --- a/x2goserver-compat/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/make -f - -SRC_DIR=$(CURDIR) -SHELL=/bin/bash - -INSTALL_DIR=install -d -o root -g root -m 755 -INSTALL_FILE=install -o root -g root -m 644 -INSTALL_PROGRAM=install -o root -g root -m 755 - -RM_FILE=rm -f -RM_DIR=rmdir -p --ignore-fail-on-non-empty - -DESTDIR ?= -PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go - -BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) - -man_pages = `cd man && find * -type f` - -MAN2HTML_BIN = man2html -MAN2HTML_SRC = man -MAN2HTML_DEST = .build_man2html/html - -all: clean build - -build: build-arch build-indep - -build-arch: - -build-indep: build_man2html - -build_man2html: - mkdir -p $(MAN2HTML_DEST) - for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done - for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done - -clean: clean_man2html - -clean_man2html: - rm -rf `dirname $(MAN2HTML_DEST)` - -install: install_scripts install_config install_man install_version - -install_scripts: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) - $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ - -install_config: - -install_man: - $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 - gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 - -install_version: - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-compat $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat - -uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version - -uninstall_scripts: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done - for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done - -uninstall_config: - -uninstall_man: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done - $(RM_DIR) $(DESTDIR)$(MANDIR) || true - -uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat - $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-compat/README.md b/x2goserver-compat/README.md deleted file mode 100644 index 114c247..0000000 --- a/x2goserver-compat/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# x2goserver-compat -This folder contains backwards compatibility stuff and sources that that are used by old clients. Have a look into each subfolder, they're pretty outdated. - - * bin - - contains the old scripts for suspending and agend-suspending as well as the terminate script. - - * man - - man page documenations - - * share - - x2gofeature.d folder, also for backwards compatibility. - - diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat deleted file mode 100644 index 1667ae5..0000000 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ /dev/null @@ -1 +0,0 @@ -4.1.0.0-preview \ No newline at end of file diff --git a/x2goserver-compat/bin/x2gosuspend b/x2goserver-compat/bin/x2gosuspend deleted file mode 100755 index 0408a67..0000000 --- a/x2goserver-compat/bin/x2gosuspend +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -# this script is here for reasons of backwards compatibility with older clients -x2gosuspend-session $@ \ No newline at end of file diff --git a/x2goserver-compat/bin/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent deleted file mode 100755 index 8090c64..0000000 --- a/x2goserver-compat/bin/x2gosuspend-agent +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -shift; -shift; -shift; - -my $capt=shift; -my @words=split(" ",$capt); - -system("/usr/bin/x2gosuspend-session @words[2] > /dev/null"); \ No newline at end of file diff --git a/x2goserver-compat/bin/x2goterminate b/x2goserver-compat/bin/x2goterminate deleted file mode 100755 index ca76052..0000000 --- a/x2goserver-compat/bin/x2goterminate +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2007-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -use strict; -my $proc=shift; - -my @outp=split(",","$proc"); -for(my $i=0;$i<@outp;$i++) -{ - system("kill @outp[$i]"); -} diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8 deleted file mode 100644 index e49e430..0000000 --- a/x2goserver-compat/man/man8/x2gosuspend-agent.8 +++ /dev/null @@ -1,23 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gosuspend-agent 8 "Jan 2013" "Version 4.1.x.y" "X2Go Server Tool (compat)" -.SH NAME -x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients) -.SH SYNOPSIS -'nh -.fi -.ad l -x2gosuspend-agent <session-name> - -.SH DESCRIPTION -\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script -is required to allow session suspending for old \fBx2goclient\fR versions. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project -(http://www.x2go.org). diff --git a/x2goserver-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8 deleted file mode 100644 index 71b74d1..0000000 --- a/x2goserver-compat/man/man8/x2gosuspend.8 +++ /dev/null @@ -1,23 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gosuspend 8 "Jan 2013" "Version 4.1.x.y" "X2Go Server Tool (compat)" -.SH NAME -x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients) -.SH SYNOPSIS -'nh -.fi -.ad l -x2gosuspend <session-name> - -.SH DESCRIPTION -\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script -is required to allow session suspending for old \fBx2goclient\fR versions. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project -(http://www.x2go.org). diff --git a/x2goserver-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8 deleted file mode 100644 index d52372f..0000000 --- a/x2goserver-compat/man/man8/x2goterminate.8 +++ /dev/null @@ -1,23 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goterminate 8 "Jan 2013" "Version 4.1.x.y" "X2Go Server Tool (compat)" -.SH NAME -x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients) -.SH SYNOPSIS -'nh -.fi -.ad l -x2goterminate <session-name> - -.SH DESCRIPTION -\fBx2goterminate\fR is a deprecated script belonging to X2Go Server. The availability of this script -is required to allow session termination from old \fBx2goclient\fR versions. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project -(http://www.x2go.org). diff --git a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features deleted file mode 100755 index 8d023ae..0000000 --- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -X2GO_LIB_PATH="$(x2gopath libexec)"; - -$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" - -X2GO_FEATURE=$1 - -# check for X2Go server core features -case "$X2GO_FEATURE" in - - "X2GO_COMPAT_SCRIPTS") echo "ok"; exit 0;; - *) exit -1;; - -esac - diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile deleted file mode 100755 index d168617..0000000 --- a/x2goserver-pyhoca/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/make -f - -SRC_DIR=$(CURDIR) -SHELL=/bin/bash - -INSTALL_DIR=install -d -o root -g root -m 755 -INSTALL_FILE=install -o root -g root -m 644 -INSTALL_PROGRAM=install -o root -g root -m 755 - -RM_FILE=rm -f -RM_DIR=rmdir -p --ignore-fail-on-non-empty - -DESTDIR ?= -PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go - -BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) -FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) - -#man_pages = `cd man && find * -type f` - -#MAN2HTML_BIN = man2html -#MAN2HTML_SRC = man -#MAN2HTML_DEST = .build_man2html/html - -all: clean build - -build: build-arch build-indep - -build-arch: - -build-indep: build_man2html - -build_man2html: - -clean: clean_man2html - -clean_man2html: - -install: install_scripts install_config install_man install_version - -install_scripts: - -install_config: - -install_man: - -install_version: - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-pyhoca $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca - -uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version - -uninstall_scripts: - -uninstall_config: - -uninstall_man: - -uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca - $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-pyhoca/README.md b/x2goserver-pyhoca/README.md deleted file mode 100644 index d467d2e..0000000 --- a/x2goserver-pyhoca/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# x2goserver-pyhoca -This folder contains the neccessary placeholder and feature definitions to execute the pyhoca client side. - - * bin - - placeholder folder - - * man - - man page documentations - - * share - - feature definition itself, seems empty so far, maybe only to use the feature installation process? diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca deleted file mode 100644 index 1667ae5..0000000 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ /dev/null @@ -1 +0,0 @@ -4.1.0.0-preview \ No newline at end of file diff --git a/x2goserver-pyhoca/bin/.placeholder b/x2goserver-pyhoca/bin/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/x2goserver-pyhoca/man/man8/.placeholder b/x2goserver-pyhoca/man/man8/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features deleted file mode 100755 index f0020eb..0000000 --- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -X2GO_LIB_PATH="$(x2gopath libexec)"; - -$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" - -X2GO_FEATURE=$1 - -# check for X2Go server core features -case "$X2GO_FEATURE" in - - *) exit -1;; - -esac - diff --git a/x2goserver.spec b/x2goserver.spec index 4e67fa6..42a39b2 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -30,7 +30,6 @@ Requires: net-tools Requires: openssh-server Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # We need a database -Requires: perl(DBD::SQLite) # For killall in x2gosuspend-session Requires: psmisc Requires: pwgen @@ -43,6 +42,10 @@ Requires: x2goagent Requires: xorg-x11-xinit Requires: xorg-x11-fonts-misc Requires(pre): shadow-utils +Requires: x2goserver-extensions +#Recommends: x2goserver-xsession +#Recommands: x2goserver-fmbindings +#Recommends: x2goserver-printing %{?perl_default_filter} @@ -59,15 +62,92 @@ This package contains the main daemon and tools for X2Go server-side session administrations. +%package common +Summary: X2Go Server (common files) + +%description common +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains common files needed by the X2Go Server +and the X2Go::Server Perl API. + + +%package perl-X2Go-Server +Summary: Perl X2Go::Server package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl-X2Go-Log = %{version}-%{release} +Requires: perl-X2Go-Server-DB = %{version}-%{release} + +%description perl-X2Go-Server +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Server Perl package. + + +%package perl-X2Go-Server-DB +Summary: Perl X2Go::Server::DB package +Requires: x2goserver-common = %{version}-%{release} +Requires: perl-X2Go-Log = %{version}-%{release} +Requires: perl(DBD::SQLite) +Requires: perl(DBD::Pg) + +%description perl-X2Go-Server-DB +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Server::DB Perl package. + + +%package perl-X2Go-Log +Summary: Perl X2Go::Log package +Requires: x2goserver-common = %{version}-%{release} + +%description perl-X2Go-Log +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains the X2Go::Log Perl package. + + %package printing -Summary: X2Go server printing support +Summary: X2Go Server (printing support) Requires: %{name} = %{version}-%{release} %description printing -The X2Go server printing package provides client-side printing support for +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +The X2Go Server printing package provides client-side printing support for X2Go. -This package has to be installed on X2Go servers that shall be able to pass +This package has to be installed on X2Go Servers that shall be able to pass X2Go print jobs on to the X2Go client. This package co-operates with the cups-x2go CUPS backend. If CUPS server and @@ -76,6 +156,77 @@ this package on the X2Go server(s) (and the cups-x2go package on the CUPS server). +%package extensions +Summary: X2Go Server (extension support) +Requires: %{name} = %{version}-%{release} + +%description extensions +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +The X2Go Server extension namespace offers contributors +to add script functionality to X2Go. + +Make sure you have this package installed on your server +if you want X2Go clients to be able to access your server +without lack of features. + + +%package xsession +Summary: X2Go Server (Xsession runner) +Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-xinit + +%description xsession + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This X2Go Server add-on enables Xsession script handling + when starting desktop sessions with X2Go. + . + Amongst others the parsing of Xsession scripts will + enable desktop-profiles, ssh-agent startups, gpgagent + startups and many more Xsession related features on + X2Go session login automagically. + +%package fmbindings +Summary: X2Go Server (file manager bindings) +Requires: %{name} = %{version}-%{release} +Requires: xdg-utils +Requires: desktop-file-utils + +%description fmbindings +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + +This package contains generic MIME type information +for X2Go's local folder sharing. It can be used with all +freedesktop.org compliant desktop shells. + +However, this package can be superseded by other, more specific +destkop binding components, if installed and being used with the +corresponding desktop shell: + - under LXDE by x2golxdebindings + - under GNOMEv2 by x2gognomebindings + - under KDE4 by plasma-widget-x2go + - under MATE by x2gomatebindings + + %prep %setup -q @@ -122,38 +273,38 @@ mkdir -p %{buildroot}%{_initddir} install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2gocleansessions %endif -%pre +%pre common getent group x2gouser >/dev/null || groupadd -r x2gouser getent passwd x2gouser >/dev/null || \ useradd -r -g x2gouser -d /var/lib/x2go -s /sbin/nologin \ -c "x2go" x2gouser exit 0 -%post +%post perl-X2Go-Server-DB # Initialize the session database [ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && %{_sbindir}/x2godbadmin --createdb || : %if 0%{?fedora} -%systemd_post x2gocleansessions.service +%systemd_post x2goserver.service %preun -%systemd_preun x2gocleansessions.service +%systemd_preun x2goserver.service %postun -%systemd_postun x2gocleansessions.service +%systemd_postun x2goserver.service %else -/sbin/chkconfig --add x2gocleansessions +/sbin/chkconfig --add x2goserver %postun if [ "$1" -ge "1" ] ; then - /sbin/service x2gocleansessions condrestart >/dev/null 2>&1 || : + /sbin/service x2goserver condrestart >/dev/null 2>&1 || : fi %preun if [ "$1" = 0 ]; then - /sbin/service x2gocleansessions stop >/dev/null 2>&1 - /sbin/chkconfig --del x2gocleansessions + /sbin/service x2goserver stop >/dev/null 2>&1 + /sbin/chkconfig --del x2goserver fi %endif @@ -168,22 +319,15 @@ exit 0 %files %doc debian/copyright %doc debian/changelog -%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %dir %{_sysconfdir}/x2go/ -%config(noreplace) %{_sysconfdir}/x2go/x* -%config(noreplace) %{_sysconfdir}/x2go/Xsession.options -%{_sysconfdir}/x2go/Xresources -%{_sysconfdir}/x2go/Xsession -%{_sysconfdir}/x2go/Xsession.d +%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver %{_bindir}/x2go* +%exclude %{_bindir}/x2goserver-run-extensions +%exclude %{_bindir}/x2gofm %exclude %{_bindir}/x2goprint %dir %{_libdir}/x2go -%{_libdir}/x2go/extensions -%{_libdir}/x2go/x2gosqlitewrapper.pl -%attr(02755,root,x2gouser) %{_libdir}/x2go/x2gosqlitewrapper %{_libdir}/x2go/x2gochangestatus %{_libdir}/x2go/x2gocreatesession -%{_libdir}/x2go/x2godbwrapper.pm %{_libdir}/x2go/x2gogetagent %{_libdir}/x2go/x2gogetdisplays %{_libdir}/x2go/x2gogetports @@ -192,30 +336,99 @@ exit 0 %{_libdir}/x2go/x2goinsertsession %{_libdir}/x2go/x2golistsessions_sql %{_libdir}/x2go/x2gologlevel -%{_libdir}/x2go/x2gologlevel.pm %{_libdir}/x2go/x2goresume %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* %{_mandir}/man8/x2go*.8.gz +%exclude %{_mandir}/man8/x2goserver-run-extensions.8.gz +%exclude %{_mandir}/man8/x2gofm.8.gz %exclude %{_mandir}/man8/x2goprint.8.gz -%{_datadir}/x2go/ -%exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing +%{_datadir}/x2go/x2gofeature.d/ +%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features +%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features +%{_datadir}/x2go/versions/VERSION.x2goserver %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/ %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions %if 0%{?fedora} -%{_unitdir}/x2gocleansessions.service +%{_unitdir}/x2goserver.service %else -%{_initddir}/x2gocleansessions +%{_initddir}/x2goserver %endif + +%files perl-X2Go-Log +%{_libdir}/perl5/X2Go/Log.pm +%{_mandir}/man3/X2Go::Log.* + + +%files perl-X2Go-Server +%dir %{_libdir}/perl5/X2Go +%{_libdir}/perl5/X2Go/Config.pm +%{_libdir}/perl5/X2Go/Server.pm +%{_libdir}/perl5/X2Go/SupeReNicer.pm +%{_libdir}/perl5/X2Go/Utils.pm +%{_mandir}/man3/X2Go::Config.* +%{_mandir}/man3/X2Go::Server.* +%{_mandir}/man3/X2Go::SupeReNicer.* +%{_mandir}/man3/X2Go::Utils.* + + +%files perl-X2Go-Server-DB +%dir %{_libdir}/perl5/X2Go/DB +%dir %{_libdir}/x2go +%{_libdir}/perl5/X2Go/DB/* +%{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper +%{_libdir}/x2go/libx2go-server-db-sqlite3-wrapper.pl +%{_mandir}/man3/X2Go::Server::DB.* +%{_mandir}/man3/X2Go::Server::DB::* +%dir %{_sysconfdir}/x2go/x2gosql +%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql + + +%files common +%dir %{_sysconfdir}/x2go/ +%config(noreplace) %{_sysconfdir}/x2go/x2go* +%{_mandir}/man5/x2goserver.conf.5.gz +%dir %{_datadir}/x2go/versions +%{_datadir}/x2go/versions/VERSION.x2goserver-common + + +%files extensions +%dir %{_libdir}/x2go/extensions +%{_libdir}/x2go/extensions +%{_bindir}/x2goserver-run-extensions +%dir %{_datadir}/x2go/x2gofeature.d +%{_datadir}/x2go/x2gofeature.d/ +%{_datadir}/x2go/versions/VERSION.x2goserver-extensions +%{_mandir}/man8/x2goserver-run-extensions.8.gz + + +%files fmbindings +%{_datadir}/x2go/versions/VERSION.x2goserver-extensions +%{_bindir}/x2gofm +%{_datadir}/applications/ +%{_datadir}/mime/ +%{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features +%{_mandir}/man8/x2gofm.8.gz + + %files printing %{_bindir}/x2goprint -%{_mandir}/man8/x2goprint.8.gz %{_datadir}/x2go/versions/VERSION.x2goserver-printing %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint +%{_mandir}/man8/x2goprint.8.gz + + +%files xsession +%config(noreplace) %{_sysconfdir}/x2go/Xsession.options +%{_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 %changelog 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).

1 0

Build failed in Jenkins: x2goclient+nightly+epel-6 #7
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

See <http://jenkins.x2go.org:8080/job/x2goclient+nightly+epel-6/7/> ------------------------------------------ Started by user mike Building in workspace <http://jenkins.x2go.org:8080/job/x2goclient+nightly+epel-6/ws/> Fetching changes from the remote Git repository Fetching upstream changes from git://code.x2go.org/x2goclient.git Checking out Revision 119635850c8408e45d2d2dca2f3c5b013f8da1c6 (origin/master) First time build. Skipping changelog. [x2goclient+nightly+epel-6] $ /bin/sh -xe /tmp/hudson5600222639144267050.sh + cd /var/lib/jenkins/bin + RPM_BUILD_FOR=epel:6 FORCE_BUILD=yes ./x2go-build+upload-rpm-package x2goclient heuler + set_vars x2goclient heuler + TEMP_BASE=/var/lib/jenkins/tmp/ + mkdir -p /var/lib/jenkins/tmp/ + chmod 2770 /var/lib/jenkins/tmp/ + PROJECT_PATH=x2goclient + PROJECT_PATH=x2goclient ++ basename x2goclient + PROJECT=x2goclient ++ echo heuler/ ++ cut -d/ -f1 + ARGV2_COMPONENT=heuler ++ echo heuler/ ++ cut -d/ -f2 + ARGV2_CODENAME= + COMPONENT=heuler + CODENAMES= + '[' -n '' ']' + true ++ date +%Y%m%d + DATE=20131206 + '[' xheuler = xmain ']' + echo baikal + grep heuler + '[' xheuler = xheuler ']' + CHECKOUT=master + '[' x20131206 = xtoday ']' + PROJECT_DIR=/var/lib/jenkins/build/heuler/x2goclient + PKGDIST=/var/lib/jenkins/pkg-dist/heuler/x2goclient + LOCK_FILE=/var/lib/jenkins/build/heuler/x2goclient/../.x2goclient.lock + mkdir -p /var/lib/jenkins/tmp/ + mkdir -p /var/lib/jenkins/build/heuler/x2goclient + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goclient + return 0 ++ basename ./x2go-build+upload-rpm-package + '[' xx2go-build+upload-rpm-package = xx2go-build-rpm-package ']' ++ basename ./x2go-build+upload-rpm-package + '[' xx2go-build+upload-rpm-package = xx2go-build+upload-rpm-package ']' + cd /var/lib/jenkins/build/heuler/x2goclient + pkgneedsbuild master + CHECKOUT=master + '[' -d .git ']' ++ date +%s + TIMESTAMP=1386365049 ++ git branch ++ awk '{print $2}' ++ grep '*' + CURRENT_BRANCH=master + git checkout master + git checkout -b tmp-1386365049 + LANG=en_US.UTF-8 + git pull origin master + egrep '^Already up-to-date.$' + git checkout master + git branch -D tmp-1386365049 + exit 1 + '[' yes = yes ']' + lock_workspace + wait_for_lock + '[' -f /var/lib/jenkins/build/heuler/x2goclient/../.x2goclient.lock ']' + echo 20243 + prepare_workspace + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SOURCES + '[' -d /var/lib/jenkins/build/heuler/x2goclient/.git ']' + cd /var/lib/jenkins/build/heuler/x2goclient + git reset --hard HEAD is now at 1196358 fix sed expr in x2goclient.spec + git checkout --force master Already on 'master' Your branch is ahead of 'origin/master' by 5 commits. + git pull origin master >From git://code.x2go.org/x2goclient * branch master -> FETCH_HEAD Already up-to-date. + git fetch origin upstream:upstream fatal: Couldn't find remote ref upstream + true + git fetch origin pristine-tar:pristine-tar fatal: Couldn't find remote ref pristine-tar + true + git reset --hard HEAD is now at 1196358 fix sed expr in x2goclient.spec + git clean -df ++ git show-ref -s heads/master + GIT_OBJECT_ID=119635850c8408e45d2d2dca2f3c5b013f8da1c6 + cd /var/lib/jenkins/build/heuler/x2goclient + '[' x '!=' x ']' + return 0 + unlock_workspace + rm -f /var/lib/jenkins/build/heuler/x2goclient/../.x2goclient.lock + clear_pkgdist + echo epel:6 + sed -e 's/ /\n/g' + read line ++ echo epel:6 ++ cut -d: -f1 ++ tr '[:upper:]' '[:lower:]' + l_DIST=epel ++ echo epel:6 ++ cut -d: -f2- ++ sed -e 's/,/ /g' ++ tr '[:upper:]' '[:lower:]' + l_CODENAMES=6 + echo 'fedora epel' + grep epel + for l_CODENAME in '$l_CODENAMES' + test -z + for l_ARCH in x86_64 i386 + '[' x '!=' xx86_64 ']' + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64 + rm -f /var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SOURCES/x2goclient-4.0.1.2.tar.gz + rm -f /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64/build.log /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64/root.log /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64/state.log + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64/x2goclient-*.rpm' + for l_ARCH in x86_64 i386 + '[' x '!=' xi386 ']' + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/i386 + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SOURCES/x2goclient-*.tar.gz' + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/i386/*.log' + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/i386/x2goclient-*.rpm' + read line + return 0 + build_packages ++ mktemp -d --tmpdir=/var/lib/jenkins/tmp/ + TEMP_DIR=/var/lib/jenkins/tmp/tmp.WpXhqhgsni + mkdir -p /var/lib/jenkins/tmp/tmp.WpXhqhgsni/x2goclient + chmod 2770 /var/lib/jenkins/tmp/tmp.WpXhqhgsni -Rf + cd /var/lib/jenkins/build/heuler/x2goclient + git clone --local /var/lib/jenkins/build/heuler/x2goclient /var/lib/jenkins/tmp/tmp.WpXhqhgsni/x2goclient/ Cloning into '/var/lib/jenkins/tmp/tmp.WpXhqhgsni/x2goclient'... done. + cd /var/lib/jenkins/tmp/tmp.WpXhqhgsni ++ cd x2goclient ++ gitrevno ++ cd - + GITREV=465 + rm -Rf x2goclient/.git + mv x2goclient/x2goclient.spec . ++ cat x2goclient.spec ++ egrep '^Version:.*' ++ awk '{ print $2 }' + UPSTREAM_VERSION=4.0.1.2 ++ cat x2goclient.spec ++ egrep '^Release:.*' ++ awk '{ print $2 }' + PKG_RELEASE='0x2go1%{?dist}' ++ sed -e 's/%{?dist}//' ++ echo '0x2go1%{?dist}' + PKG_SRCRELEASE=0x2go1 ++ cat x2goclient.spec ++ egrep '^BuildArch:.*noarch$' ++ echo no + IS_NOARCH=no + '[' heuler = heuler ']' + IS_RELEASE=0 + sed -i x2goclient.spec -e 's/%{?dist}/.0.git20131206.465.heuler%{?dist}/' + '[' -f x2goclient/debian/patches/series ']' + cat x2goclient.spec + egrep '^Source[1-9]+:.*' + awk '{ print $2 }' + read source_file + mv /var/lib/jenkins/tmp/tmp.WpXhqhgsni/x2goclient /var/lib/jenkins/tmp/tmp.WpXhqhgsni/x2goclient-4.0.1.2 + tar -czf /var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SOURCES/x2goclient-4.0.1.2.tar.gz x2goclient-4.0.1.2 + rpmbuild -D '%_topdir /var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild' -bs x2goclient.spec Wrote: /var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SRPMS/x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm + cd + rm /var/lib/jenkins/tmp/tmp.WpXhqhgsni/x2goclient -Rf + echo epel:6 + sed -e 's/ /\n/g' + read line ++ echo epel:6 ++ cut -d: -f1 ++ tr '[:upper:]' '[:lower:]' + l_DIST=epel ++ echo epel:6 ++ cut -d: -f2- ++ sed -e 's/,/ /g' ++ tr '[:upper:]' '[:lower:]' + l_CODENAMES=6 + echo 'fedora epel' + grep epel + for l_CODENAME in '$l_CODENAMES' + test -z + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64 /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/i386 + '[' x '!=' xx86_64 ']' + mock -r epel-6-x86_64 --result /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64 /var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SRPMS/x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm INFO: mock.py version 1.1.33 starting... Start: init plugins INFO: selinux disabled Finish: init plugins Start: run INFO: Start(/var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SRPMS/x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm) Config(epel-6-x86_64) Start: lock buildroot Start: clean chroot Finish: clean chroot Finish: lock buildroot Start: chroot init Start: lock buildroot Mock Version: 1.1.33 INFO: Mock Version: 1.1.33 INFO: calling preinit hooks INFO: enabled root cache Start: unpacking root cache Finish: unpacking root cache INFO: enabled yum cache Start: cleaning yum metadata Finish: cleaning yum metadata INFO: enabled ccache Start: device setup Finish: device setup Start: yum update Start: Outputting list of available packages Finish: Outputting list of available packages Finish: yum update Finish: lock buildroot Finish: chroot init INFO: Installed packages: Start: build phase for x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm Start: device setup Finish: device setup Start: build setup for x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm Finish: build setup for x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm Start: rpmbuild -bb x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm Start: Outputting list of installed packages Finish: Outputting list of installed packages ERROR: Exception(/var/lib/jenkins/pkg-dist/heuler/x2goclient/rpmbuild/SRPMS/x2goclient-4.0.1.2-0x2go1.0.git20131206.465.heuler.src.rpm) Config(epel-6-x86_64) 6 minutes 13 seconds INFO: Results and/or logs in: /var/lib/jenkins/pkg-dist/heuler/x2goclient/epel/6/x86_64 INFO: Cleaning up build root ('clean_on_failure=True') Start: lock buildroot Start: clean chroot INFO: chroot (/var/lib/mock/epel-6-x86_64) unlocked and deleted Finish: clean chroot Finish: lock buildroot ERROR: Command failed. See logs for output. # ['bash', '--login', '-c', 'rpmbuild -bb --target x86_64 --nodeps builddir/build/SPECS/x2goclient.spec'] Build step 'Execute shell' marked build as failure

1 8

Build failed in Jenkins: x2goserver+nightly+fedora-19 #1
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

See <http://jenkins.x2go.org:8080/job/x2goserver+nightly+fedora-19/1/> ------------------------------------------ Started by an SCM change Building in workspace <http://jenkins.x2go.org:8080/job/x2goserver+nightly+fedora-19/ws/> Cloning the remote Git repository Cloning repository git://code.x2go.org/x2goserver.git git --version git version 1.7.10.4 Checking out Revision ff0d0346071b860a4df52c84701c0b069b0850f4 (origin/master) First time build. Skipping changelog. [x2goserver+nightly+fedora-19] $ /bin/sh -xe /tmp/hudson7999774630331370699.sh + cd /var/lib/jenkins/bin + RPM_BUILD_FOR=fedora:19 FORCE_BUILD=yes ./x2go-build+upload-rpm-package x2goserver heuler + set_vars x2goserver heuler + TEMP_BASE=/var/lib/jenkins/tmp/ + mkdir -p /var/lib/jenkins/tmp/ + chmod 2770 /var/lib/jenkins/tmp/ + PROJECT_PATH=x2goserver + PROJECT_PATH=x2goserver ++ basename x2goserver + PROJECT=x2goserver ++ echo heuler/ ++ cut -d/ -f1 + ARGV2_COMPONENT=heuler ++ echo heuler/ ++ cut -d/ -f2 + ARGV2_CODENAME= + COMPONENT=heuler + CODENAMES= + '[' -n '' ']' + true ++ date +%Y%m%d + DATE=20131207 + '[' xheuler = xmain ']' + echo baikal + grep heuler + '[' xheuler = xheuler ']' + CHECKOUT=master + '[' x20131207 = xtoday ']' + PROJECT_DIR=/var/lib/jenkins/build/heuler/x2goserver + PKGDIST=/var/lib/jenkins/pkg-dist/heuler/x2goserver + LOCK_FILE=/var/lib/jenkins/build/heuler/x2goserver/../.x2goserver.lock + mkdir -p /var/lib/jenkins/tmp/ + mkdir -p /var/lib/jenkins/build/heuler/x2goserver + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goserver + return 0 ++ basename ./x2go-build+upload-rpm-package + '[' xx2go-build+upload-rpm-package = xx2go-build-rpm-package ']' ++ basename ./x2go-build+upload-rpm-package + '[' xx2go-build+upload-rpm-package = xx2go-build+upload-rpm-package ']' + cd /var/lib/jenkins/build/heuler/x2goserver + pkgneedsbuild master + CHECKOUT=master + '[' -d .git ']' ++ date +%s + TIMESTAMP=1386454294 ++ git branch ++ grep '*' ++ awk '{print $2}' + CURRENT_BRANCH=master + git checkout master + git checkout -b tmp-1386454294 + LANG=en_US.UTF-8 + git pull origin master + egrep '^Already up-to-date.$' + git checkout master + git branch -D tmp-1386454294 + exit 1 + '[' yes = yes ']' + lock_workspace + wait_for_lock + '[' -f /var/lib/jenkins/build/heuler/x2goserver/../.x2goserver.lock ']' + echo 5662 + prepare_workspace + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES + '[' -d /var/lib/jenkins/build/heuler/x2goserver/.git ']' + cd /var/lib/jenkins/build/heuler/x2goserver + git reset --hard HEAD is now at ff0d034 Fix x2goresume-session. The several parameters placed into the NX options file are expected by x2goresume-session at very specific positions. This we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355). + git checkout --force master Already on 'master' Your branch is ahead of 'origin/master' by 7 commits. + git pull origin master >From git://code.x2go.org/x2goserver * branch master -> FETCH_HEAD Already up-to-date. + git fetch origin upstream:upstream fatal: Couldn't find remote ref upstream + true + git fetch origin pristine-tar:pristine-tar fatal: Couldn't find remote ref pristine-tar + true + git reset --hard HEAD is now at ff0d034 Fix x2goresume-session. The several parameters placed into the NX options file are expected by x2goresume-session at very specific positions. This we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355). + git clean -df ++ git show-ref -s heads/master + GIT_OBJECT_ID=ff0d0346071b860a4df52c84701c0b069b0850f4 + cd /var/lib/jenkins/build/heuler/x2goserver + '[' x '!=' x ']' + return 0 + unlock_workspace + rm -f /var/lib/jenkins/build/heuler/x2goserver/../.x2goserver.lock + clear_pkgdist + sed -e 's/ /\n/g' + read line + echo fedora:19 ++ echo fedora:19 ++ cut -d: -f1 ++ tr '[:upper:]' '[:lower:]' + l_DIST=fedora ++ echo fedora:19 ++ cut -d: -f2- ++ sed -e 's/,/ /g' ++ tr '[:upper:]' '[:lower:]' + l_CODENAMES=19 + echo 'fedora epel' + grep fedora + for l_CODENAME in '$l_CODENAMES' + test -z + for l_ARCH in x86_64 i386 + '[' x '!=' xx86_64 ']' + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goserver/fedora/19/x86_64 + rm -f /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES/x2goserver-4.0.1.9.tar.gz + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goserver/fedora/19/x86_64/*.log' + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goserver/fedora/19/x86_64/x2goserver-*.rpm' + for l_ARCH in x86_64 i386 + '[' x '!=' xi386 ']' + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goserver/fedora/19/i386 + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES/x2goserver-*.tar.gz' + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goserver/fedora/19/i386/*.log' + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goserver/fedora/19/i386/x2goserver-*.rpm' + read line + return 0 + build_packages ++ mktemp -d --tmpdir=/var/lib/jenkins/tmp/ + TEMP_DIR=/var/lib/jenkins/tmp/tmp.kZ2xNINJkt + mkdir -p /var/lib/jenkins/tmp/tmp.kZ2xNINJkt/x2goserver + chmod 2770 /var/lib/jenkins/tmp/tmp.kZ2xNINJkt -Rf + cd /var/lib/jenkins/build/heuler/x2goserver + git clone --local /var/lib/jenkins/build/heuler/x2goserver /var/lib/jenkins/tmp/tmp.kZ2xNINJkt/x2goserver/ Cloning into '/var/lib/jenkins/tmp/tmp.kZ2xNINJkt/x2goserver'... done. + cd /var/lib/jenkins/tmp/tmp.kZ2xNINJkt ++ cd x2goserver ++ gitrevno ++ cd - + GITREV=833 + rm -Rf x2goserver/.git + mv x2goserver/x2goserver.spec . ++ cat x2goserver.spec ++ egrep '^Version:.*' ++ awk '{ print $2 }' + UPSTREAM_VERSION=4.0.1.9 ++ cat x2goserver.spec ++ awk '{ print $2 }' ++ egrep '^Release:.*' + PKG_RELEASE='0x2go1%{?dist}' ++ echo '0x2go1%{?dist}' ++ sed -e 's/%{?dist}//' + PKG_SRCRELEASE=0x2go1 ++ cat x2goserver.spec ++ egrep '^BuildArch:.*noarch$' ++ echo no + IS_NOARCH=no + '[' heuler = heuler ']' + IS_RELEASE=0 + sed -i x2goserver.spec -e 's/%{?dist}/.0.git20131207.833.heuler%{?dist}/' + '[' -f x2goserver/debian/patches/series ']' + cat x2goserver.spec + egrep '^Source[1-9]+:.*' + awk '{ print $2 }' + read source_file + find x2goserver/rpm/x2gocleansessions.service -maxdepth 0 find: `x2goserver/rpm/x2gocleansessions.service': No such file or directory + find x2goserver/x2gocleansessions.service -maxdepth 0 find: `x2goserver/x2gocleansessions.service': No such file or directory + read source_file + find x2goserver/rpm/x2gocleansessions.init -maxdepth 0 + cp x2goserver/rpm/x2gocleansessions.init . + continue + read source_file + mv /var/lib/jenkins/tmp/tmp.kZ2xNINJkt/x2goserver /var/lib/jenkins/tmp/tmp.kZ2xNINJkt/x2goserver-4.0.1.9 + tar -czf /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES/x2goserver-4.0.1.9.tar.gz x2goserver-4.0.1.9 + rpmbuild -D '%_topdir /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild' -bs x2goserver.spec error: Bad file: /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES/x2gocleansessions.init: No such file or directory error: Bad file: /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES/x2gocleansessions.service: No such file or directory RPM build errors: Bad file: /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES/x2gocleansessions.init: No such file or directory Bad file: /var/lib/jenkins/pkg-dist/heuler/x2goserver/rpmbuild/SOURCES/x2gocleansessions.service: No such file or directory Build step 'Execute shell' marked build as failure

1 2

cups-x2go.git - master (branch) updated: 3.0.0.4-13-geb25b6f
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via eb25b6f09d544a7380aff5ae84627ff9b7c7ed7a (commit) from d594ed1cc32647c3400cd0adbff1f4d58e85a0a9 (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 ----------------------------------------------------------------- commit eb25b6f09d544a7380aff5ae84627ff9b7c7ed7a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 12:06:56 2013 +0100 cups-x2go.spec: Drop (Fedora package) changelog. ----------------------------------------------------------------------- Summary of changes: cups-x2go.spec | 10 ---------- debian/changelog | 6 ++++-- 2 files changed, 4 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/cups-x2go.spec b/cups-x2go.spec index 6cd1e3c..72180a0 100644 --- a/cups-x2go.spec +++ b/cups-x2go.spec @@ -45,13 +45,3 @@ cp -p VERSION.cups-x2go %{buildroot}%{_datadir}/x2go/versions/ %changelog -* Wed Sep 4 2013 Orion Poplawski <orion(a)cora.nwra.com> 3.0.0.4-2 -- Use install to set permissions on cups-x2go -- Drop %%doc for now -- Mark config file as %%config(noreplace) -- Fix Group -- Drop tabs - -* Fri Dec 14 2012 Orion Poplawski <orion(a)cora.nwra.com> 3.0.0.4-1 -- Initial Fedora package - diff --git a/debian/changelog b/debian/changelog index 47f21af..2e6c7b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,10 @@ cups-x2go (3.0.1.0-0x2go1) UNRELEASED; urgency=low information. (Fixes: #299). * debian/source/format: + Switch to format 1.0. - * Ship cups-x2go.spec (RPM package definitions) in upstream project. (Thanks - to the Fedora package maintainers). + * cups-x2go.spec: + + Ship cups-x2go.spec (RPM package definitions) in upstream project. (Thanks + to the Fedora package maintainers). + + Drop (Fedora package) changelog. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Nov 2012 17:10:22 +0100 hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.4-14-ga1985a4
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via a1985a4ad2fa7446088a1fc005ee004a85866d05 (commit) from eb25b6f09d544a7380aff5ae84627ff9b7c7ed7a (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 ----------------------------------------------------------------- commit a1985a4ad2fa7446088a1fc005ee004a85866d05 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 12:31:32 2013 +0100 only set up BuildRoot: manually for epel-5 builds ----------------------------------------------------------------------- Summary of changes: cups-x2go.spec | 2 ++ 1 file changed, 2 insertions(+) The diff of changes is: diff --git a/cups-x2go.spec b/cups-x2go.spec index 72180a0..4d1c3a2 100644 --- a/cups-x2go.spec +++ b/cups-x2go.spec @@ -12,8 +12,10 @@ BuildArch: noarch Requires: cups Requires: ghostscript +%if 0%{?el5} # For compatibility with EPEL5 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%endif %description CUPS backend for printing from X2Go. hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-46-g889404d
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via 889404d9b76b92e374e6ae13078f45fed6fa38ab (commit) from ce706b56c35eed88ae096b81aaaaa359d540ed1b (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 ----------------------------------------------------------------- commit 889404d9b76b92e374e6ae13078f45fed6fa38ab Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 12:29:06 2013 +0100 package for Fedora 18 has to be built against shipped qtbrowserplugin, epel6 has /usr/bin/qmake-qt4 ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 0b75682..ffd9519 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -19,7 +19,7 @@ BuildRequires: man %endif BuildRequires: openldap-devel BuildRequires: qt-devel -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 BuildRequires: qtbrowserplugin-static %endif Requires: hicolor-icon-theme @@ -43,10 +43,10 @@ directories. # Fix up install issues sed -i -e 's/-o root -g root//' Makefile sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile -%if 0%{?el5} || 0%{?el6} +%if 0%{?el5} sed -i -e '/^QMAKE_BINARY=/s@/usr/bin/qmake-qt4@/usr/lib/qt4/bin/qmake@' Makefile %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6 # Use system qtbrowserplugin sed -i -e '/CFGPLUGIN/aTEMPLATE=lib' x2goclient.pro sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-45-gce706b5
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via ce706b56c35eed88ae096b81aaaaa359d540ed1b (commit) from d0a173ec6d6ce1faa72ab23f9417926b6e244eb7 (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 ----------------------------------------------------------------- commit ce706b56c35eed88ae096b81aaaaa359d540ed1b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 12:05:13 2013 +0100 Clear (Fedora package) changelog. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goclient.spec | 31 ------------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 11e76e5..b2ccb08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low * x2goclient.spec: + Ship x2goclient.spec (RPM package definitions) in upstream project. (Thanks to the Fedora package maintainers). + + Clear (Fedora package) changelog. + Make package build on Fedora/EPEL versions that do not have the qtbrowserplugin package. + Replace qmake-qt4 path in Makefile. diff --git a/x2goclient.spec b/x2goclient.spec index b996465..0b75682 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -90,34 +90,3 @@ fi %changelog -* Wed Sep 11 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.1-1 -- Update to 4.0.1.1 -- Drop patches applied upstream - -* Thu Sep 5 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.0-5 -- Build against system qtbrowserplugin - -* Fri Aug 30 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.0-4 -- Add BR desktop-file-utils and validate desktop file -- Add gtk-update-icon-cache scriptlets - -* Wed Apr 10 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.0-3 -- Add patch to set dpi automatically - -* Thu Mar 28 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.0-2 -- Add patch to fix proxy connection issue - -* Mon Mar 25 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.1.0-1 -- Update to 4.0.1.0 - -* Tue Feb 12 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.0.2-1 -- Update to 4.0.0.2 - -* Fri Jan 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 4.0.0.1-1 -- Update to 4.0.0.1 - -* Wed Dec 12 2012 Orion Poplawski <orion(a)cora.nwra.com> - 3.99.3.1-0.1 -- Update to latest git - -* Tue Dec 11 2012 Orion Poplawski <orion(a)cora.nwra.com> - 3.99.3.0-1 -- Initial Fedora package hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-265-gf42f184
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via f42f18407a1f578cda599cce2810028b7eabebd1 (commit) from 165a06cb57a69ce166dd89645983da8c9633364f (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 ----------------------------------------------------------------- commit f42f18407a1f578cda599cce2810028b7eabebd1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 12:20:52 2013 +0100 Use same init script name as on Debian (x2goserver.init, x2goserver.service). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + rpm/{x2gocleansessions.init => x2goserver.init} | 0 x2goserver.service | 2 +- x2goserver.spec | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) rename rpm/{x2gocleansessions.init => x2goserver.init} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 146f630..a337463 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low (Thanks to the Fedora package maintainers). File differs from the Fedora file already. + Clear (Fedora package) changelog. + + Use same init script name as on Debian (x2goserver.init, x2goserver.service). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:16:22 +0100 diff --git a/rpm/x2gocleansessions.init b/rpm/x2goserver.init similarity index 100% rename from rpm/x2gocleansessions.init rename to rpm/x2goserver.init diff --git a/x2goserver.service b/x2goserver.service index 81df9a8..18b276a 100644 --- a/x2goserver.service +++ b/x2goserver.service @@ -1,5 +1,5 @@ [Unit] -Description=X2Go session cleanup +Description=X2Go Server Daemon [Service] ExecStart=/usr/sbin/x2gocleansessions diff --git a/x2goserver.spec b/x2goserver.spec index 0148807..4e67fa6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -11,8 +11,8 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. # cd x2goserver # git archive --prefix=x2goserver-4.1.0.0-20130722git65169c9/ 65169c9d65b117802e50631be0bbd719163d969e | gzip > ../x2goserver-4.1.0.0-20130722git65169c9.tar.gz #Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz -Source1: x2gocleansessions.service -Source2: x2gocleansessions.init +Source1: x2goserver.service +Source2: x2goserver.init BuildRequires: perl(ExtUtils::MakeMaker) %if 0%{?fedora} 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).

1 0

buildscripts.git - master (branch) updated: eb4f086420cb350919b86548e42c7726b55b96c7
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via eb4f086420cb350919b86548e42c7726b55b96c7 (commit) from f4a5a4df70c61729da30c7d5f0dfff69fe8e1068 (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 ----------------------------------------------------------------- commit eb4f086420cb350919b86548e42c7726b55b96c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 12:18:17 2013 +0100 typo fix ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index e607dfb..3ea87c7 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -142,7 +142,7 @@ clear_pkgdist() { for l_ARCH in x86_64 i386; do if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - rm -f "$PKGDIST/rpmbuild/SOURCES/* + rm -f "$PKGDIST/rpmbuild/SOURCES/"* rm -f "$PKGDIST/rpmbuild/SRPMS/$PROJECT-"*.src.rpm rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.log rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT-"*.rpm hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: f4a5a4df70c61729da30c7d5f0dfff69fe8e1068
by git-admin＠x2go.org 08 Dec '13

08 Dec '13

The branch, master has been updated via f4a5a4df70c61729da30c7d5f0dfff69fe8e1068 (commit) from 82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8 (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 ----------------------------------------------------------------- commit f4a5a4df70c61729da30c7d5f0dfff69fe8e1068 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 8 12:17:00 2013 +0100 fix inclusion of Source: files ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 93f6eb9..e607dfb 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -142,8 +142,7 @@ clear_pkgdist() { for l_ARCH in x86_64 i386; do if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - #rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" - rm -f "$PKGDIST/rpmbuild/SOURCES/$PROJECT-"*.tar.gz + rm -f "$PKGDIST/rpmbuild/SOURCES/* rm -f "$PKGDIST/rpmbuild/SRPMS/$PROJECT-"*.src.rpm rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.log rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT-"*.rpm @@ -189,8 +188,8 @@ build_packages() { fi cat $PROJECT.spec | egrep "^Source[1-9]+:.*" | awk '{ print $2 }' | while read source_file; do - find $PROJECT/rpm/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/rpm/$source_file . && continue - find $PROJECT/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/$source_file . + find $PROJECT/rpm/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/rpm/$source_file $PKGDIST/rpmbuild/SOURCES/ && continue + find $PROJECT/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/$source_file $PKGDIST/rpmbuild/SOURCES/ done mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013