[X2Go-Commits] [x2goserver] 01/02: SUSE and Fedora/RHEL have different package group names.
git-admin at x2go.org
git-admin at x2go.org
Tue Oct 14 06:38:11 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit aec9bbc2f327a6032e83a162f860606950c30ae6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Oct 14 06:30:49 2014 +0200
SUSE and Fedora/RHEL have different package group names.
---
debian/changelog | 1 +
x2goserver.spec | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index beaf0be..96cf955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,6 +168,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
+ Replace historical "egrep" with "grep -E".
+ Systemd support for SUSE >= 12.10.
+ Set %defattr macro for every bin:package.
+ + SUSE and Fedora/RHEL have different package group names.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200
diff --git a/x2goserver.spec b/x2goserver.spec
index 5687468..85745f7 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -3,7 +3,11 @@ Version: 4.1.0.0
Release: 0.0x2go1%{?dist}
Summary: X2Go Server
+%if 0%{?fedora} || 0%{?rhel}
Group: Applications/Communications
+%else
+Group: Productivity/Networking/Remote Desktop
+%endif
License: GPLv2+
URL: http://www.x2go.org
Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
@@ -100,7 +104,11 @@ Requires: perl
%else
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%endif
+%if 0%{?fedora} || 0%{?rhel}
Group: Applications/Communications
+%else
+Group: Productivity/Networking/Remote Desktop
+%endif
%description common
X2Go is a server based computing environment with
@@ -125,7 +133,11 @@ Requires: perl
%else
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%endif
+%if 0%{?fedora} || 0%{?rhel}
Group: Development/Libraries
+%else
+Group Development/Libraries/Perl
+%endif
%description -n perl-X2Go-Server
X2Go is a server based computing environment with
@@ -150,7 +162,11 @@ Requires: perl
%else
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%endif
+%if 0%{?fedora} || 0%{?rhel}
Group: Development/Libraries
+%else
+Group Development/Libraries/Perl
+%endif
%description -n perl-X2Go-Server-DB
X2Go is a server based computing environment with
@@ -172,7 +188,11 @@ Requires: perl
%else
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%endif
+%if 0%{?fedora} || 0%{?rhel}
Group: Development/Libraries
+%else
+Group Development/Libraries/Perl
+%endif
%description -n perl-X2Go-Log
X2Go is a server based computing environment with
@@ -194,7 +214,11 @@ Requires: perl
%else
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%endif
+%if 0%{?fedora} || 0%{?rhel}
Group: Applications/Communications
+%else
+Group: Productivity/Networking/Remote Desktop
+%endif
%description printing
X2Go is a server based computing environment with
@@ -220,7 +244,11 @@ server).
%package extensions
Summary: X2Go Server (extension support)
Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel}
Group: Applications/Communications
+%else
+Group: Productivity/Networking/Remote Desktop
+%endif
%description extensions
X2Go is a server based computing environment with
@@ -244,7 +272,11 @@ Summary: X2Go Server (Xsession runner)
Requires: %{name} = %{version}-%{release}
# For /etc/X11/Xresources
Requires: xorg-x11-xinit
+%if 0%{?fedora} || 0%{?rhel}
Group: Applications/Communications
+%else
+Group: Productivity/Networking/Remote Desktop
+%endif
%description xsession
X2Go is a server based computing environment with
@@ -270,7 +302,11 @@ Requires: xdg-utils
Requires: desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+%if 0%{?fedora} || 0%{?rhel}
Group: Applications/Communications
+%else
+Group: Productivity/Networking/Remote Desktop
+%endif
%description fmbindings
X2Go is a server based computing environment with
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list