x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-23-gb06196d
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via b06196d55c25a7e3b9cfa9ab21a67b9f4e35eec9 (commit) from e4ec07e660ed436acefb7ef2322f864a4c1b6ee9 (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 b06196d55c25a7e3b9cfa9ab21a67b9f4e35eec9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 11:41:30 2013 +0100 Different Linux distros have pidof installed in different locations. If pidof is not available, we brutally kill all instances of x2godesktopsharing when a session suspends. ----------------------------------------------------------------------- Summary of changes: bin/x2goterminate-desktopsharing | 14 +++++++++++++- debian/changelog | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/bin/x2goterminate-desktopsharing b/bin/x2goterminate-desktopsharing index 986ef0b..7792582 100755 --- a/bin/x2goterminate-desktopsharing +++ b/bin/x2goterminate-desktopsharing @@ -29,11 +29,23 @@ fi X2GO_LIB_PATH=`x2gopath libexec` +if type -p pidof 1>/dev/null 2>/dev/null; then + PIDOF=pidof +elif [ -x /sbin/pidof ]; then + PIDOF=/sbin/pidof +elif [ -x /usr/sbin/pidof ]; then + PIDOF=/usr/sbin/pidof +else + # no pidof utility found, get out the big hammer!!! + killall x2godesktopsharing + exit 0 +fi + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) -for process_id in `pidof x2godesktopsharing`; do +for process_id in `$PIDOF x2godesktopsharing`; do env_of_process=$(cat -A /proc/$process_id/environ) env_of_process=${env_of_process//^@/\\n} display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2) diff --git a/debian/changelog b/debian/changelog index 24f2191..3d12002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low - Update man pages (Fixes: #281). - Fix FSF address in COPYING file. - Use x2gopath in scripts rather than deprecated x2gobasepath. + - Different Linux distros have pidof installed in different + locations. If pidof is not available, we brutally kill all instances + of x2godesktopsharing when a session suspends. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Rework LONG_DESCRIPTION in several other aspects. hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-22-ge4ec07e
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via e4ec07e660ed436acefb7ef2322f864a4c1b6ee9 (commit) from 2403383f0d77e47248678cf98c1eaa151069385d (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 e4ec07e660ed436acefb7ef2322f864a4c1b6ee9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 10:03:29 2013 +0100 x2godesktopsharing.spec: the translation updates are implemented in x2godesktopsharing.pro, so let's skip them ----------------------------------------------------------------------- Summary of changes: x2godesktopsharing.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e0583d1..c373050 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -43,11 +43,9 @@ a local X11 session. %build %if 0%{?el5} -%{_libdir}/qt4/bin/lrelease -%{_libdir}/qt4/bin/qmake +%{_libdir}/qt4/bin/qmake x2godesktopsharing.pro %else -lrelease-qt4 -qmake-qt4 +qmake-qt4 x2godesktopsharing.pro %endif make %{?_smp_mflags} hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-308-g132994f
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 132994f66f14cd75b7632e320a5e20ceaaa98599 (commit) from f67bb50ebbb2c9b41fc0e9594692179555280fb0 (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 132994f66f14cd75b7632e320a5e20ceaaa98599 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 09:44:21 2013 +0100 x2goserver.spec: update MIME and desktop database after installation/removal of x2goserver-fmbindings ----------------------------------------------------------------------- Summary of changes: x2goserver.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) The diff of changes is: diff --git a/x2goserver.spec b/x2goserver.spec index f792926..47f9e69 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -341,6 +341,16 @@ fi %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || : +%post fmbindings +/usr/bin/update-mime-database /usr/share/mime &>/dev/null || : +/usr/bin/update-desktop-database &>/dev/null || : + +%postun fmbindings +if [ $1 -eq 0 ] ; then + /usr/bin/update-mime-database /usr/share/mime &>/dev/null || : + /usr/bin/update-desktop-database &>/dev/null || : +fi + %pre printing getent group x2goprint >/dev/null || groupadd -r x2goprint getent passwd x2goprint >/dev/null || \ 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: 672f94e84af7ea772e33f765ced9cd0156909dd7
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 672f94e84af7ea772e33f765ced9cd0156909dd7 (commit) from 41b33d012b83eaa5fc5200a375e804aa8a00ea2e (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 672f94e84af7ea772e33f765ced9cd0156909dd7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 09:28:45 2013 +0100 fix nice calls with qemubuilder ----------------------------------------------------------------------- Summary of changes: bin/build-deb-package | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/bin/build-deb-package b/bin/build-deb-package index 94b313c..5370475 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -250,29 +250,29 @@ build_packages() { DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&- } [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } done } [ "x$USE_SUDO" = "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted $SA_OPTION 0<&- + nice sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted $SA_OPTION 0<&- } [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + nice sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + nice sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } done } 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: 41b33d012b83eaa5fc5200a375e804aa8a00ea2e
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 41b33d012b83eaa5fc5200a375e804aa8a00ea2e (commit) from bb65e74b36088b0da1e451271dc80101e268c0ea (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 41b33d012b83eaa5fc5200a375e804aa8a00ea2e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 09:26:18 2013 +0100 run the build daemons with nice to not affect the KVM instances on the build server so much ----------------------------------------------------------------------- Summary of changes: bin/build-deb-package | 12 ++++++------ bin/build-rpm-package | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/bin/build-deb-package b/bin/build-deb-package index 9cc8bae..94b313c 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -247,32 +247,32 @@ build_packages() { [ "x$USE_SUDO" != "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&- } [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } done } [ "x$USE_SUDO" = "xyes" ] && { [ "x$EXTRA_ARCHS_ONLY" = "x" ] && { [ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted $SA_OPTION 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted $SA_OPTION 0<&- } [ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 OTHERMIRROR="$OTHERMIRROR" nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386 -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } } for extra_arch in $EXTRA_ARCHS; do mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && { - sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- + sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" nice $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- } done } diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 6b2dcc6..efa8a5a 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -239,7 +239,7 @@ build_packages() { echo "Waiting for some other build to finish..." sleep 30 done - if mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then + if nice mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then rpmsign-unattended -D "%_gpg_name debian(a)x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log else 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

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-21-g2403383
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 2403383f0d77e47248678cf98c1eaa151069385d (commit) from 9eb787eba8bed8ec171a23cff36f40ea5cad591f (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 2403383f0d77e47248678cf98c1eaa151069385d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 09:10:26 2013 +0100 Run lrelease-qt4 before running qmake-qt4. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2godesktopsharing.spec | 2 ++ 2 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37c4066..24f2191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low project. (Thanks to the Fedora package maintainers). + Conditional dependency on sysvinit-tools (EPEL) or procps-ng (Fedora) to get the pidof binary installed. + + Run lrelease-qt4 before running qmake-qt4. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 08 Jun 2013 01:13:44 +0200 diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 38ad2e0..e0583d1 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -43,8 +43,10 @@ a local X11 session. %build %if 0%{?el5} +%{_libdir}/qt4/bin/lrelease %{_libdir}/qt4/bin/qmake %else +lrelease-qt4 qmake-qt4 %endif make %{?_smp_mflags} hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.1.0-20-g9eb787e
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 9eb787eba8bed8ec171a23cff36f40ea5cad591f (commit) from ce570610efd7b7bbd25dc8e6e556e0fb6efec1e9 (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 9eb787eba8bed8ec171a23cff36f40ea5cad591f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 08:40:46 2013 +0100 x2godesktopsharing.spec: fix conditional dependecy on sysvinit-tools ----------------------------------------------------------------------- Summary of changes: x2godesktopsharing.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index b8d51e3..38ad2e0 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -12,7 +12,7 @@ BuildRequires: desktop-file-utils BuildRequires: qt4-devel Requires: hicolor-icon-theme Requires: x2goserver >= 4.0.0.0 -%if 0%{?el5} || 0%{?el5} +%if 0%{?el5} || 0%{?el6} Requires: sysvinit-tools %else Requires: procps-ng hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

page changed: wiki:repositories:start
by wiki-admin＠x2go.org 17 Dec '13

17 Dec '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/12/17 23:05 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:26.0) Gecko/20100101 Firefox/26.0 IP-Address : 4.28.99.98 Hostname : NORTHWEST-R.edge3.Denver1.Level3.net Old Revision: http://wiki.x2go.org/doku.php/wiki:repositories:start?rev=1382446544 New Revision: http://wiki.x2go.org/doku.php/wiki:repositories:start Edit Summary: [Fedora] User : orion @@ -45,10 +45,14 @@ * Maintainer: Jan Engelhardt * Repository Files (save to /etc/yum.repos.d): [[http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_6/X… 6]], [[http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/RHEL_5/X… 5]] ===== Fedora ===== + + There are official Fedora rpms for x2goclient, x2goserver, and the pyhoca clients. + + There is also: * Project Home: [[https://build.opensuse.org/project/show?project=X11%3ARemoteDesktop%3Ax2go|… Build Service]] * Maintainer: Jan Engelhardt * Repository Files (save to /etc/yum.repos.d/): [[http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_1… 18]] ===== Others ===== * ... -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2goclient.git - master (branch) updated: 4.0.1.2-5-g4f7b924
by git-admin＠x2go.org 17 Dec '13

17 Dec '13

The branch, master has been updated via 4f7b92434a9d3023000131bb1c93207c97507cc0 (commit) from ee4370574c9fae00886bdaf0ac11eaf1d527720e (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 4f7b92434a9d3023000131bb1c93207c97507cc0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 17 23:37:27 2013 +0100 x2goclient.spec: fix spelling of serverbased/server-based ----------------------------------------------------------------------- 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 f10dae8..5d119aa 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -36,7 +36,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif %description -X2Go is a serverbased computing environment with +X2Go is a server-based computing environment with - session resuming - low bandwidth support - session brokerage support @@ -57,7 +57,7 @@ Requires: nxproxy Requires: openssh-clients, openssh-server %description -n x2goplugin -X2Go is a serverbased computing environment with +X2Go is a server-based computing environment with - session resuming - low bandwidth support - session brokerage support @@ -78,7 +78,7 @@ Group: Applications/Communications Requires: httpd %description -n x2goplugin-provider -X2Go is a serverbased computing environment with +X2Go is a server-based computing environment with - session resuming - low bandwidth support - session brokerage support 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.2-3-gd019af7
by git-admin＠x2go.org 17 Dec '13

17 Dec '13

The branch, master has been updated via d019af7fc3de6d899a88959524cb55bf5766b11e (commit) from e2bc3fce6afefb5cf78ba1d9255aae583e9ea9e0 (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 d019af7fc3de6d899a88959524cb55bf5766b11e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Dec 17 23:30:56 2013 +0100 x2goclient.spec: improve plugin-provider sections (Thanks to Orion) ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 85fe95d..f10dae8 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -149,10 +149,13 @@ fi %{_libdir}/mozilla/plugins/libx2goplugin.so %files -n x2goplugin-provider -%{_sysconfdir}/x2go/x2goplugin-apache.conf -%{_sysconfdir}/httpd/ -%{_sysconfdir}/x2go/plugin-provider/ -%{_datadir}/x2go/plugin/ +# Link +%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf +%dir %{_sysconfdir}/x2go +%dir %{_sysconfdir}/x2go/plugin-provider +%config(noreplace) %{_sysconfdir}/x2go/plugin-provider/x2goplugin.html +%config(noreplace) %{_sysconfdir}/x2go/x2goplugin-apache.conf +%{_datadir}/x2go/ %changelog 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013