Comparing the Fedora and x2go versions of x2goserver.spec led me to these patches.
Most are pretty simple except perhaps the one renaming x2goserver-x2goagent to x2goagent - although I see now that I'm missing an: Obsoletes: x2goserver-x2goagent < <some version> I still really don't see the need for x2goagent-virtual. Also, no active RedHat distro (RHEL5+) needs %defattr(-,root,root) anymore. I'm not sure about Suse, but I'd be very surprised. -- Orion Poplawski Technical Manager 720-772-5637 NWRA, Boulder/CoRA Office FAX: 303-415-9702 3380 Mitchell Lane [email protected] Boulder, CO 80301 http://www.nwra.com
>From 7c644257e0bf49ea432d4e010c8f3d6bd753b13c Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 5 Jan 2017 15:16:41 -0700 Subject: [PATCH 1/7] Requires(post) does not imply Requires, and missing ones on grep and x2goserver-common --- x2goserver.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2goserver.spec b/x2goserver.spec index 2447cfa..3634215 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -86,6 +86,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi Requires: bash # For x2goruncommand - for now Requires: bc +Requires: grep # For x2goshowblocks Requires: lsof # For netstat in x2goresume-session @@ -134,6 +135,7 @@ Requires(postun): systemd Requires: perl-X2Go-Server = %{version}-%{release} Requires(post): perl-X2Go-Server-DB +Requires: x2goserver-common Requires(post): x2goserver-common Requires: x2goserver-extensions Requires: x2goserver-xsession -- 1.8.3.1
>From 794805001f49e3c41bdb18787fc0c471ff1daa7c Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 5 Jan 2017 15:19:08 -0700 Subject: [PATCH 2/7] Fedora now allows Recommends --- x2goserver.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 3634215..0742b59 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -139,8 +139,10 @@ Requires: x2goserver-common Requires(post): x2goserver-common Requires: x2goserver-extensions Requires: x2goserver-xsession -#Recommends: x2goserver-fmbindings -#Recommends: x2goserver-printing +%if 0%{?fedora} +Recommends: x2goserver-fmbindings +Recommends: x2goserver-printing +%endif %{?perl_default_filter} -- 1.8.3.1
>From 54adbc5dc53b51d2a85cfbddd6916d4f8703c000 Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 5 Jan 2017 15:26:07 -0700 Subject: [PATCH 3/7] perl(:MODULE_COMPAT...) is only needed for perl modules --- x2goserver.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 0742b59..362d5ca 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -78,8 +78,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif # For running any command, really. @@ -167,8 +165,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif # for useradd/groupadd @@ -335,8 +331,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif # for useradd/groupadd @@ -434,8 +428,6 @@ Requires: perl = %{perl_version} %else %{perl_requires} %endif -%else -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif Requires: perl(Cwd) -- 1.8.3.1
>From ed5f7c0800d04a59add1be95e59090ee1bcd4467 Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 5 Jan 2017 15:37:47 -0700 Subject: [PATCH 4/7] Drop x2goagent-virtual and just ship x2goagent --- x2goserver.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 362d5ca..deeeedc 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -99,7 +99,7 @@ Requires: pwgen Requires: sshfs # For /etc/sudoers.d Requires: sudo -Requires: x2goagent-virtual +Requires: x2goagent Requires(post): grep Requires: perl(File::Which) Requires: perl(File::BaseDir) @@ -299,13 +299,12 @@ X2Go is a server based computing environment with This package contains the X2Go::Log Perl package. -%package x2goagent +%package -n x2goagent Group: Applications/System Summary: X2Go Server's X2Go Agent Requires: nxagent >= 3.5.99.0 -Provides: x2goagent-virtual -%description x2goagent +%description -n x2goagent X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -318,9 +317,9 @@ X2Go Agent functionality has been completely incorporated into nxagent's code base. If the nxagent binary is executed under the name of "x2goagent", the X2Go functionalities get activated. -The x2goserver-x2goagent package is a wrapper that activates X2Go -branding in nxagent. Please refer to the nxagent package's description -for more information on NX. +The x2goagent package is a wrapper that activates X2Go branding in +nxagent. Please refer to the nxagent package's description for more +information on NX. %package printing Summary: X2Go Server (printing support) @@ -820,7 +819,7 @@ fi %{_mandir}/man8/x2gofm.8* -%files x2goagent +%files -n x2goagent %defattr(-,root,root) %doc debian/copyright %doc debian/changelog -- 1.8.3.1
>From be857c73a20910ab07f7f2c1a9f651135e8d7b70 Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 5 Jan 2017 15:39:50 -0700 Subject: [PATCH 5/7] Fix NXLIBDIR path --- x2goserver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index deeeedc..af87a92 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -498,11 +498,11 @@ sed -i -e 's/-o root -g root//' */Makefile %build export PATH=%{_qt4_bindir}:$PATH -make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_prefix}%{_lib}/nx +make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_prefix}/%{_lib}/nx +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx # We currently need to disable the broken symlinks check on OpenSuSE, as long # as we can't pull in nx-libs 3.5.99 or higher. Once we can add it as a BuildRequires, # this env var can and should be removed again. -- 1.8.3.1
>From 143f0cc95aa7a0d117f9245d9dd2a1c7f5a21b1b Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 5 Jan 2017 15:42:38 -0700 Subject: [PATCH 6/7] Delete .packlist which may be in different locations --- x2goserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver.spec b/x2goserver.spec index af87a92..7dcb4c4 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -509,7 +509,7 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx export NO_BRP_STALE_LINK_ERROR=yes # Make sure the .packlist file is removed from %%{perl_vendorarch}... -rm -f %{buildroot}%{perl_vendorarch}/auto/x2goserver/.packlist +find %{buildroot}%{perl_vendorarch} -name .packlist | while read file; do rm -f "$file"; done # Remove placeholder files (in a way that works on EPEL-5, as well) find %{buildroot}%{_libdir}/x2go/extensions/ -type f -name ".placeholder" | while read file; do rm -f "$file"; done -- 1.8.3.1
>From 6fa7cbf5e72d5db32552456f41ad13a437999759 Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 5 Jan 2017 15:51:30 -0700 Subject: [PATCH 7/7] Sort some %files entries --- x2goserver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 7dcb4c4..6c3affb 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -701,6 +701,7 @@ fi %{_libdir}/x2go/x2gocreatesession %{_libdir}/x2go/x2gocreateshadowsession %{_libdir}/x2go/x2gogetagent +%{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gogetdisplays %{_libdir}/x2go/x2gogetports %{_libdir}/x2go/x2gogetstatus @@ -713,13 +714,12 @@ fi %{_libdir}/x2go/x2gormforward %{_libdir}/x2go/x2gormport %{_libdir}/x2go/x2gosuspend-agent -%{_libdir}/x2go/x2gogetagentstate %{_libdir}/x2go/x2gosyslog %{_sbindir}/x2go* %{_mandir}/man8/x2go*.8* -%exclude %{_mandir}/man8/x2goserver-run-extensions.8* %exclude %{_mandir}/man8/x2gofm.8* %exclude %{_mandir}/man8/x2goprint.8* +%exclude %{_mandir}/man8/x2goserver-run-extensions.8* %dir %{_datadir}/x2go/ %dir %{_datadir}/x2go/x2gofeature.d/ %{_datadir}/x2go/x2gofeature.d/x2goserver.features -- 1.8.3.1
_______________________________________________ x2go-dev mailing list [email protected] http://lists.x2go.org/listinfo/x2go-dev
