x2godesktopsharing.git - master (branch) updated: 3.1.1.0-19-gce57061 - x2go-commits

17 Dec 2013

The branch, master has been updated
       via  ce570610efd7b7bbd25dc8e6e556e0fb6efec1e9 (commit)
      from  80d50f61f48a286e2b6c7499f3866a31a835d365 (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 ce570610efd7b7bbd25dc8e6e556e0fb6efec1e9
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Dec 17 21:50:41 2013 +0100

    Conditional dependency on sysvinit-tools (EPEL) or procps-ng (Fedora) to get the pidof binary installed.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    2 ++
 x2godesktopsharing.spec |    5 +++++
 2 files changed, 7 insertions(+)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 4318967..37c4066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2godesktopsharing (3.1.1.1-0x2go1) UNRELEASED; urgency=low
   * x2godesktopsharing.spec:
     + Ship x2godesktopsharing.spec (RPM package definitions) in upstream
       project. (Thanks to the Fedora package maintainers).
+    + Conditional dependency on sysvinit-tools (EPEL) or procps-ng (Fedora) to
+      get the pidof binary installed.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 08 Jun 2013 01:13:44 +0200
 
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 6f41ab6..b8d51e3 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -12,6 +12,11 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
 Requires:       hicolor-icon-theme
 Requires:       x2goserver >= 4.0.0.0
+%if 0%{?el5} || 0%{?el5}
+Requires:       sysvinit-tools
+%else
+Requires:       procps-ng
+%endif
 
 %if 0%{?el5}
 # For compatibility with EPEL5


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).

    