[X2Go-Dev] [PATCH] spec file cleanup
Mike Gabriel
mike.gabriel at das-netzwerkteam.de
Tue Sep 9 11:26:21 CEST 2014
Hi Orion,
thanks for helping out here with your expertise!!!
I applied your patch (cleanly) against the release/4.0.1.x branch of
X2Go Server [1].
I then cherry-picked that commit to the master branch and had to
resolve some git conflicts. I hope the commit on master is fine, as
well [2].
Thanks!
Mike
[1]
http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=945187dadcd377b6fcce22aeb2e4f03ccf46f185
[2]
http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=8df684f8e1c738fccb6ce49724670aed7881a745
On Di 09 Sep 2014 00:55:36 CEST, Orion Poplawski wrote:
> This tries to bring things more inline with the Fedora x2goserver.spec.
>
> - Sort items alphabetically
> - Use %{?rhel} conditional
> - Drop perl requires that are added automatically
> - Add Requires: xorg-x11-xauth
> - Add Requires(post): grep pelr(DBD::SQLite) for proper initialization
> - Add systemd scriptlet requires
> - Minor syntax changes
> - Use * for man pages endings
> - Fix fmbindings file ownership
> ---
> x2goserver.spec | 65
> +++++++++++++++++++++++++++++++--------------------------
> 1 file changed, 35 insertions(+), 30 deletions(-)
>
> diff --git a/x2goserver.spec b/x2goserver.spec
> index 57239bd..e142d0c 100644
> --- a/x2goserver.spec
> +++ b/x2goserver.spec
> @@ -3,7 +3,6 @@ Version: 4.0.1.16
> Release: 0.0x2go1%{?dist}
> Summary: X2Go Server
>
> -
> Group: Applications/Communications
> License: GPLv2+
> URL: http://www.x2go.org
> @@ -19,28 +18,27 @@ Source2: x2goserver.init
> BuildRoot: %(mktemp -ud
> %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> %endif
>
> +BuildRequires: desktop-file-utils
> BuildRequires: perl(ExtUtils::MakeMaker)
> -%if 0%{?fedora} || 0%{?el7}
> +%if 0%{?fedora} || 0%{?rhel} >= 7
> BuildRequires: man2html-core
> BuildRequires: systemd
> %else
> BuildRequires: man
> %endif
> -BuildRequires: desktop-file-utils
> # So XSESSIONDIR gets linked
> BuildRequires: xorg-x11-xinit
> # For x2goruncommand - for now
> Requires: bc
> +# For x2goshowblocks
> +Requires: lsof
> # For netstat in x2goresume-session
> Requires: net-tools
> Requires: openssh-server
> Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl}
> -V:version`"; echo $version))
> -Requires: perl(Capture::Tiny)
> # We need a database
> # For killall in x2gosuspend-session
> Requires: psmisc
> -# For x2goshowblocks
> -Requires: lsof
> # For x2godbadmin
> Requires: pwgen
> # For printing, file-sharing
> @@ -48,10 +46,16 @@ Requires: sshfs
> # For /etc/sudoers.d
> Requires: sudo
> Requires: x2goagent >= 3.5.0.25
> -# For /etc/X11/Xresources
> -Requires: xorg-x11-xinit
> Requires: xorg-x11-fonts-misc
> +Requires: xorg-x11-xauth
> Requires(pre): shadow-utils
> +Requires(post): grep
> +Requires(post): perl(DBD::SQLite)
> +%if 0%{?fedora} || 0%{?rhel} >= 7
> +Requires(post): systemd
> +Requires(preun): systemd
> +Requires(postun): systemd
> +%endif
> Requires: x2goserver-extensions
> #Recommends: x2goserver-xsession
> #Recommands: x2goserver-fmbindings
> @@ -90,7 +94,7 @@ X2Go is a server based computing environment with
> The X2Go Server printing package provides client-side printing support for
> X2Go.
>
> -This package has to be installed on X2Go Servers that shall be able to pass
> +This package has to be installed on X2Go servers that shall be able to pass
> X2Go print jobs on to the X2Go client.
>
> This package co-operates with the cups-x2go CUPS backend. If CUPS server and
> @@ -124,6 +128,7 @@ without lack of features.
> %package xsession
> Summary: X2Go Server (Xsession runner)
> Requires: %{name} = %{version}-%{release}
> +# For /etc/X11/Xresources
> Requires: xorg-x11-xinit
> Group: Applications/Communications
>
> @@ -208,7 +213,7 @@ touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions
> # Printing spool dir
> mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint
>
> -%if 0%{?fedora} || 0%{?el7}
> +%if 0%{?fedora} || 0%{?rhel} >= 7
> # System.d session cleanup script
> mkdir -p %{buildroot}%{_unitdir}
> install -pm0644 %SOURCE1 %{buildroot}%{_unitdir}
> @@ -238,11 +243,12 @@ exit 0
>
>
> %post
> -# Initialize the session database (first attempt, may fail if
> perl-X2Go-Server-DB is not yet installed
> -[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] && egrep
> "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null &&
> - %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>/dev/null || :
> +# Initialize the session database
> +[ ! -s %{_sharedstatedir}/x2go/x2go_sessions ] &&
> + egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 &&
> + %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || :
>
> -%if 0%{?fedora} || 0%{?el7}
> +%if 0%{?fedora} || 0%{?rhel} >= 7
> %systemd_post x2goserver.service
>
> %preun
> @@ -287,12 +293,10 @@ exit 0
> %files
> %doc debian/copyright
> %doc debian/changelog
> +%config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver
> +%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
> %dir %{_sysconfdir}/x2go/
> %config(noreplace) %{_sysconfdir}/x2go/x2go*
> -%dir %{_sysconfdir}/x2go/x2gosql
> -%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql
> -%config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
> -%config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver
> %{_bindir}/x2go*
> %exclude %{_bindir}/x2goserver-run-extensions
> %exclude %{_bindir}/x2gofm
> @@ -320,17 +324,17 @@ exit 0
> %{_libdir}/x2go/x2gogetagentstate
> %{_libdir}/x2go/x2gosyslog
> %{_sbindir}/x2go*
> -%{_mandir}/man8/x2go*.8.gz
> -%exclude %{_mandir}/man8/x2goserver-run-extensions.8.gz
> -%exclude %{_mandir}/man8/x2gofm.8.gz
> -%exclude %{_mandir}/man8/x2goprint.8.gz
> -%{_mandir}/man5/x2goserver.conf.5.gz
> +%{_mandir}/man5/x2go*.5*
> +%{_mandir}/man8/x2go*.8*
> +%exclude %{_mandir}/man8/x2goserver-run-extensions.8*
> +%exclude %{_mandir}/man8/x2gofm.8*
> +%exclude %{_mandir}/man8/x2goprint.8*
> %dir %{_datadir}/x2go/x2gofeature.d/
> %{_datadir}/x2go/x2gofeature.d/x2goserver.features
> %{_datadir}/x2go/versions/VERSION.x2goserver
> %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/
> %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions
> -%if 0%{?fedora} || 0%{?el7}
> +%if 0%{?fedora} || 0%{?rhel} >= 7
> %{_unitdir}/x2goserver.service
> %else
> %if 0%{?el5}
> @@ -346,16 +350,16 @@ exit 0
> %{_bindir}/x2goserver-run-extensions
> %{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features
> %{_datadir}/x2go/versions/VERSION.x2goserver-extensions
> -%{_mandir}/man8/x2goserver-run-extensions.8.gz
> +%{_mandir}/man8/x2goserver-run-extensions.8*
>
>
> %files fmbindings
> -%{_datadir}/x2go/versions/VERSION.x2goserver-fmbindings
> %{_bindir}/x2gofm
> -%{_datadir}/applications/
> -%{_datadir}/mime/
> +%{_datadir}/applications/x2gofm.desktop
> +%{_datadir}/mime/packages/sshfs-x2go.xml
> +%{_datadir}/x2go/versions/VERSION.x2goserver-fmbindings
> %{_datadir}/x2go/x2gofeature.d/x2goserver-fmbindings.features
> -%{_mandir}/man8/x2gofm.8.gz
> +%{_mandir}/man8/x2gofm.8*
>
>
> %files printing
> @@ -363,7 +367,7 @@ exit 0
> %{_datadir}/x2go/versions/VERSION.x2goserver-printing
> %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
> %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint
> -%{_mandir}/man8/x2goprint.8.gz
> +%{_mandir}/man8/x2goprint.8*
>
>
> %files xsession
> @@ -374,4 +378,5 @@ exit 0
> %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features
> %{_datadir}/x2go/versions/VERSION.x2goserver-xsession
>
> +
> %changelog
--
DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digitale PGP-Signatur
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20140909/60688cf1/attachment.pgp>
More information about the x2go-dev
mailing list