This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 8eb3c11 Set %defattr macro for every bin:package. new aec9bbc SUSE and Fedora/RHEL have different package group names. new ab7b732 silence rpmlint a bit more The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2goserver.spec | 80 ++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 12 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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@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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit ab7b732673ac999248b073dedf1d39ec3c16ac1f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 14 06:38:06 2014 +0200 silence rpmlint a bit more --- x2goserver.spec | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 85745f7..e5ca773 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -5,16 +5,13 @@ Summary: X2Go Server %if 0%{?fedora} || 0%{?rhel} Group: Applications/Communications +License: GPLv2+ %else Group: Productivity/Networking/Remote Desktop +License: GPL-2.0+ %endif -License: GPLv2+ URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz -# git clone git://code.x2go.org/x2goserver -# cd x2goserver -# git archive --prefix=x2goserver-4.1.0.0-20140722git65169c9/ 65169c9d65b117802e50631be0bbd719163d969e | gzip > ../x2goserver-4.1.0.0-20140722git65169c9.tar.gz -#Source0: %{name}/%{name}-%{version}-%{checkout}.tar.gz Source1: x2goserver.service Source2: x2goserver.init %if 0%{?el5} @@ -48,7 +45,11 @@ Requires: lsof Requires: net-tools Requires: openssh-server %if 0%{?suse_version} -Requires: perl +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif @@ -100,7 +101,11 @@ administrations. %package common Summary: X2Go Server (common files) %if 0%{?suse_version} -Requires: perl +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif @@ -129,7 +134,11 @@ Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl-X2Go-Server-DB = %{version}-%{release} %if 0%{?suse_version} -Requires: perl +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif @@ -158,7 +167,11 @@ Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl(DBD::SQLite) Requires: perl(DBD::Pg) %if 0%{?suse_version} -Requires: perl +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif @@ -184,7 +197,11 @@ This package contains the X2Go::Server::DB Perl package. Summary: Perl X2Go::Log package Requires: x2goserver-common = %{version}-%{release} %if 0%{?suse_version} -Requires: perl +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif @@ -210,7 +227,11 @@ This package contains the X2Go::Log Perl package. Summary: X2Go Server (printing support) Requires: %{name} = %{version}-%{release} %if 0%{?suse_version} -Requires: perl +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif %else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif @@ -334,7 +355,6 @@ corresponding desktop shell: %setup -q # Set path -#find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,' find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root @@ -348,7 +368,7 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=% %install make install DESTDIR=%{buildroot} PREFIX=%{_prefix} -# Make sure the .packlist file is removed from %{perl_vendorarch}... +# Make sure the .packlist file is removed from %%{perl_vendorarch}... rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist # Remove placeholder files (in a way that works on EPEL-5, as well) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org