This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit dd19432b81b620c1e98dd54b513d04a4c22468c3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 4 23:56:15 2015 +0100 SLE and openSUSE ship procps, not procps-ng (at least by package name). --- debian/changelog | 2 ++ x2godesktopsharing.spec | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3f2a3ad..bdf356d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low + SLE (<= 11.3) builds: Use %suse_update_desktop_file -n <desktop-file> to mark .desktop file non-translatable. + Add B-R on SLE 11.3: update-desktop-files. + + SLE and openSUSE ship procps, not procps-ng (at least by package + name). [ Mark Pedersen-Cook ] * New upstream version (3.1.1.2): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 64f73cf..c86886c 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -36,11 +36,16 @@ BuildRequires: qt-devel Requires: hicolor-icon-theme Requires: x2goserver >= 4.0.0.0 + +%if 0%{?suse_version} +Requires: procps +%else %if 0%{?el5} || 0%{?el6} Requires: sysvinit-tools %else Requires: procps-ng %endif +%endif %if 0%{?el5} # For compatibility with EPEL5 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git