Hello community, here is the log from the commit of package xdmsc for openSUSE:Factory checked in at 2017-12-23 12:20:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdmsc (Old) and /work/SRC/openSUSE:Factory/.xdmsc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdmsc" Sat Dec 23 12:20:02 2017 rev:18 rq:558770 version:0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xdmsc/xdmsc.changes 2011-12-07 21:41:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdmsc.new/xdmsc.changes 2017-12-23 12:20:04.229874454 +0100 @@ -1,0 +2,16 @@ +Wed Dec 20 09:58:47 UTC 2017 - [email protected] + +- Move forward to systemd based usage + +------------------------------------------------------------------- +Tue Dec 19 16:16:58 UTC 2017 - [email protected] + +- Use the %_fillupdir macro at installation time as well + +------------------------------------------------------------------- +Thu Nov 23 13:54:19 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- Old: ---- Xterminal-0.5.tar.gz New: ---- Xterminal-0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdmsc.spec ++++++ --- /var/tmp/diff_new_pack.QFeAkW/_old 2017-12-23 12:20:05.341820237 +0100 +++ /var/tmp/diff_new_pack.QFeAkW/_new 2017-12-23 12:20:05.345820042 +0100 @@ -1,7 +1,7 @@ # # spec file for package xdmsc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,12 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: xdmsc PreReq: fillup Provides: Xterminal -Version: 0.5 +Version: 0.6 Release: 0 -Summary: Xterminal -- Use SuSE Linux as an X terminal +Url: https://build.opensuse.org/package/show/X11:Utilities/xdmsc +Summary: XTerminal -- Use SUSE Linux as an X Terminal License: GPL-2.0 Group: System/X11/Utilities Source: Xterminal-%{version}.tar.gz @@ -28,18 +35,13 @@ BuildArch: noarch %description -Some useful scripts for using SuSE Linux as an X terminal. +Some useful scripts for using SUSE Linux as an X terminal. You will find the documentation in the following directory /usr/share/doc/packages/xdmsc/ - -Authors: --------- - Werner Fink <[email protected]> - %prep %setup -n Xterminal-%{version} @@ -47,19 +49,27 @@ make -f Makefile.Linux compile %install - rm -rf $RPM_BUILD_ROOT - make -f Makefile.Linux DESTDIR=$RPM_BUILD_ROOT install + make -f Makefile.Linux DESTDIR=%{buildroot} ETCRCC=%{_fillupdir} install -%clean - rm -rf $RPM_BUILD_ROOT +%pre +%service_add_pre %{name}@.service %post %{fillup_only} +%service_add_post %{name}@.service + +%preun +%service_del_preun %{name}@.service + +%postun +%service_del_postun %{name}@.service %files %defattr(-,root,root) %doc README COPYING -%config /etc/init.d/rx -/var/adm/fillup-templates/sysconfig.xdmsc +%{_unitdir}/[email protected] +%dir /usr/lib/xdmsc/ +%attr(0755,root,root) /usr/lib/xdmsc/rx +%{_fillupdir}/sysconfig.xdmsc %changelog ++++++ Xterminal-0.5.tar.gz -> Xterminal-0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Xterminal-0.5/Makefile.Linux new/Xterminal-0.6/Makefile.Linux --- old/Xterminal-0.5/Makefile.Linux 2007-02-09 11:41:40.000000000 +0100 +++ new/Xterminal-0.6/Makefile.Linux 2017-12-20 10:06:30.645745701 +0100 @@ -1,7 +1,8 @@ # # Makefile.Linux to integrate package into source tree of SuSE Linux. # -# Copyright (c) 1997-2002 SuSE GmbH Nuernberg, Germany. +# Copyright (c) 1997-2002 SuSE GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE Linux GmbH, Nuremberg, Germany. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,19 +22,19 @@ # # Author: Werner Fink # -LOGDIR = $(DESTDIR)/var/log -INIDIR = $(DESTDIR)/etc/init.d -DOINST = $(DESTDIR)/install -ETCRCC = $(DESTDIR)/var/adm/fillup-templates +LOGDIR = /var/log +INIDIR = /usr/lib/xdmsc +ETCRCC = /var/adm/fillup-templates +SYSTEM = /usr/lib/systemd/system compile: @echo "nothing to do" install: - install -d $(LOGDIR) - install -d $(INIDIR) - install -d $(DOINST) - install -d $(ETCRCC) - install -c -m 0644 rc.config.xdmsc $(ETCRCC)/sysconfig.xdmsc - install -c -m 0755 rx $(INIDIR) -# install -c -m 0755 doinst.sh $(DOINST) + install -d $(DESTDIR)$(LOGDIR) + install -d $(DESTDIR)$(INIDIR) + install -d $(DESTDIR)$(ETCRCC) + install -d $(DESTDIR)$(SYSTEM) + install -c -m 0644 rc.config.xdmsc $(DESTDIR)$(ETCRCC)/sysconfig.xdmsc + install -c -m 0755 rx $(DESTDIR)$(INIDIR) + install -c -m 0644 [email protected] $(DESTDIR)$(SYSTEM) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Xterminal-0.5/README new/Xterminal-0.6/README --- old/Xterminal-0.5/README 2005-11-29 13:23:05.000000000 +0100 +++ new/Xterminal-0.6/README 2017-12-20 10:41:12.667003650 +0100 @@ -1,11 +1,11 @@ - Xterminal 0.4 + Xterminal 0.6 ============= -Skripte, die das Betreiben eines X-Terminals unter SuSE Linux +Skripte, die das Betreiben eines X-Terminals unter SUSE Linux ermöglichen. -Some useful scripts for using SuSE Linux as X terminal. +Some useful scripts for using SUSE Linux as X terminal. -/- @@ -17,16 +17,14 @@ * X sollte installiert sein. * Der X-Server passend zur Graphikkarte MUSS mit allen seinen Hilfsdateien und Verzeichnissen installiert UND konfiguriert sein! - * In /etc/inittab MUSS die Zeile mit: + * Um das ganze mit systemd im Target multi-user zu benutzen, reicht + das Kommando - 7:2:respawn:+/etc/init.d/rx tty7 + systemctl enable [email protected] - enthalten sein (unter SuSE Linux sollte einfach Kommentar entfernen). - Wichtig: Die Nummer hinter `tty' ist identisch mit der Startnummer am - Anfang der Zeile. Der Runlevel MUSS Netzwerk haben und sollte keinen - xdm starten (unter SuSE Linux ist das Runlevel 2). - * Das Skript rx liest /etc/sysconfig/xdmsc ein, um dann die folgenden - Shell-Variablen zu benutzen: + Wichtig: Das virtuelle Terminal für den Xserver ist /dev/tty7 + * Das Skript rx in [email protected] liest /etc/sysconfig/xdmsc ein, + um dann die folgenden Shell-Variablen zu benutzen: START_RX Bei Wert "yes" startet /etc/init.d/rx einen X-Server. Bei anderen Werten gibt es eine Warnung, die bachtet @@ -52,14 +50,12 @@ * X should be installed. * The X server for your graphics card has to be installed and configured properly with all necessary files and directories! - * The following line must be in /etc/inittab: + * To use this with systemd at target multi-user, it is enought to run + the command - 7:2:respawn:+/etc/init.d/rx tty7 + systemctl enable [email protected] - (under SuSE Linux simply remove the comment character). - Note: The number after `tty' is the same number as at the begining of - the line. The runlevel must contain network support and - the xdm should not be launched (under SuSE Linux it's runlevel 2). + Note: The virtual terminal for the X server is by default /dev/tty7 * The script rx will source /etc/sysconfig/xdmsc for using the following shell variables: @@ -85,18 +81,16 @@ Literatur/SEE ALSO ------------------ - xdm(1), Xserver(1), XF86_Accel(1), Xsecurity(1), xauth(1), sessreg(1), - xhost(1), XStandards(3) + xdm(1), Xserver(1), Xsecurity(1), xauth(1), sessreg(1), systemd.unit(5), X Display Manager Control Protocol (ftp://ftp.x.org/) - Werner Fink <[email protected]> TODO: Es fehlt in den Skripten eine Schnittstelle für die XDM-AUTHENTICATION-1 -Authenifizierung, die zum Beispiel von den xdm auf einer neuren SuSE Linux +Authenifizierung, die zum Beispiel von den xdm auf einer neuren SUSE Linux unterstützt werden. Der MIT-MAGIC-COOKIE-1 Authenifizierungsmechanismus arbeitet natürlich und sollte möglichtst __NICHT__ via xhost abgeschaltet werden. Konstruktive Hinweise sind erwünscht :-) @@ -105,7 +99,7 @@ Up to now an interface to the XDM-AUTHENTICATION-1 style authentication is not yet implemented in the scripts which is supported by the xdm -on a newer SuSE Linux. The regular MIT-MAGIC-COOKIE-1 style authentication +on a newer SUSE Linux. The regular MIT-MAGIC-COOKIE-1 style authentication works as it should. Therfore __NO__ xhost command should be used. Any suggestions are welcome :-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Xterminal-0.5/doinst.sh new/Xterminal-0.6/doinst.sh --- old/Xterminal-0.5/doinst.sh 2000-09-04 16:46:32.000000000 +0200 +++ new/Xterminal-0.6/doinst.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -#!/bin/sh -# -# install/doinst.sh - to be done after extraction -# -# Copyright (c) 1996 S.u.S.E. GmbH Fuerth, Germany. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -echo "Updating etc/rc.config..." -if [ -x bin/fillup ] ; then - bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.xdmsc - if [ $? -ge 0 ] ; then - rm etc/rc.config.xdmsc - fi -else - echo "ERROR: fillup not found. This should not happen. Please compare" - echo "etc/rc.config and var/adm/fillup-templates/rc.config.xdmsc and update by hand." -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Xterminal-0.5/rx new/Xterminal-0.6/rx --- old/Xterminal-0.5/rx 2009-11-25 11:08:55.000000000 +0100 +++ new/Xterminal-0.6/rx 2017-12-20 09:56:05.037480388 +0100 @@ -4,6 +4,7 @@ # # Copyright (c) 1997-2000 SuSE GmbH Nuernberg, Germany. # Copyright (c) 2005,2007 SuSE LINUX Products GmbH Nuernberg, Germany. +# Copyright (c) 2017 SUSE SUSE Linux GmbH, Nuremberg, Germany. # # Author: Werner Fink <[email protected]> # @@ -47,9 +48,7 @@ # replaced by underscores. # -if test -x /usr/X11R6/bin/X ; then -: ${RX_SERVER=/usr/X11R6/bin/X} -elif test -x /usr/bin/Xorg ; then +if test -x /usr/bin/Xorg ; then : ${RX_SERVER=/usr/bin/Xorg} else : ${RX_SERVER=/usr/bin/X} @@ -194,7 +193,7 @@ esac # Add class after -query or -indirect - test -z "$RX_CLASS" && RX_CLASS="SuSE-X-Terminal" + test -z "$RX_CLASS" && RX_CLASS="SUSE-X-Terminal" options="$options -class $RX_CLASS" options="$options $tty $vtline" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Xterminal-0.5/[email protected] new/Xterminal-0.6/[email protected] --- old/Xterminal-0.5/[email protected] 1970-01-01 01:00:00.000000000 +0100 +++ new/Xterminal-0.6/[email protected] 2017-12-20 10:58:34.607497349 +0100 @@ -0,0 +1,30 @@ +# This file is part of xdmsc. +# + +[Unit] +Description=XTerminal -- SUSE Linux as an X Terminal +Requires=var-run.mount [email protected] plymouth-quit.service display-manager.service +After=ypbind.service gpm.service time-sync.target winbind.service acpid.service +Wants=remote-fs.target dbus.socket systemd-user-sessions.service systemd-logind.service +After=remote-fs.target dbus.socket systemd-user-sessions.service systemd-logind.service [email protected] plymouth-quit.service + +ConditionPathExists=/dev/tty0 + +[Service] +ExecStart=/usr/lib/xdmsc/rx %I +Restart=always +RestartSec=0 +UtmpIdentifier=%I +TTYPath=/dev/%I +TTYReset=yes +TTYVHangup=no +TTYVTDisallocate=yes +KillMode=process +KillSignal=SIGTERM +IgnoreSIGPIPE=no +SendSIGHUP=no + +[Install] +WantedBy=multi-user.target +DefaultInstance=tty7
