commit 2442e75a14a1e74fcccfbaf0364e250e0afeaa43595661f2c256b58db5ba3885 Author: Stefan Dirsch Date: Mon Jun 2 10:07:15 2014 +0000 Accepting request 235782 from home:Mailaender:branches:X11:XOrg fixed the SLE dependencies OBS-URL: https://build.opensuse.org/request/show/235782 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xvfb-run?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/xvfb-run-mktemp.patch b/xvfb-run-mktemp.patch new file mode 100644 index 0000000..4ad5bc5 --- /dev/null +++ b/xvfb-run-mktemp.patch @@ -0,0 +1,11 @@ +--- xvfb-run.sh 2014-05-30 01:03:57.862452101 +0200 ++++ xvfb-run.sh 2014-05-30 01:10:32.792647392 +0200 +@@ -151,7 +151,7 @@ + error "temporary directory $XVFB_RUN_TMPDIR already exists" + exit 4 + fi +- AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority) ++ AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXXXX) + fi + + # Start Xvfb. diff --git a/xvfb-run.1.gz b/xvfb-run.1.gz new file mode 100644 index 0000000..fc04a68 --- /dev/null +++ b/xvfb-run.1.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b34b94b240c784d29c6c5374ebe40da172051f7b3401d0982c54bb686ea375d6 +size 3240 diff --git a/xvfb-run.changes b/xvfb-run.changes new file mode 100644 index 0000000..a807ce2 --- /dev/null +++ b/xvfb-run.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Thu May 29 22:14:19 UTC 2014 - mailaender@opensuse.org + +- packaging for SUSE + diff --git a/xvfb-run.sh b/xvfb-run.sh new file mode 100644 index 0000000..462100b --- /dev/null +++ b/xvfb-run.sh @@ -0,0 +1,187 @@ +#!/bin/sh +# --- T2-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# T2 SDE: package/.../xorg-server/xvfb-run.sh +# Copyright (C) 2005 The T2 SDE Project +# Copyright (C) XXXX - 2005 Debian +# +# More information can be found in the files COPYING and README. +# +# 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; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- T2-COPYRIGHT-NOTE-END --- + +# $Id: xvfb-run 2166 2005-01-27 07:54:19Z branden $ +# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb, xbase-clients, and xfonts-base. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +STARTWAIT=3 +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="${TMPDIR:-/tmp}/$PROGNAME.$$" + if ! mkdir -p -m 700 "$XVFB_RUN_TMPDIR"; then + error "temporary directory $XVFB_RUN_TMPDIR already exists" + exit 4 + fi + AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority) +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \ + >"$ERRORFILE" 2>&1 +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \ + 2>&1 & +XVFBPID=$! +sleep "$STARTWAIT" + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Kill Xvfb now that the command has exited. +kill $XVFBPID + +# Clean up. +XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1 +if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi +fi + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: diff --git a/xvfb-run.spec b/xvfb-run.spec new file mode 100644 index 0000000..5434dbf --- /dev/null +++ b/xvfb-run.spec @@ -0,0 +1,60 @@ +# +# spec file for package xvfb-run +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: xvfb-run +Version: 1.5.2 +Release: 0 +Summary: Script to run a virtualized X-Server +License: GPL-2.0 +Group: Applications/Tools +Url: https://packages.debian.org/de/sid/xvfb +Source0: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh +Source1: http://manpages.ubuntu.com/manpages.gz/intrepid/man1/xvfb-run.1.gz +# PATCH-FIX-OPENSUSE https://bugzilla.redhat.com/show_bug.cgi?id=508739#c6 +Patch0: xvfb-run-mktemp.patch +Requires: coreutils +Requires: util-linux +Requires: xorg-x11-xauth +Requires: xorg-x11-server +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +This script starts an instance of Xvfb, the "fake" X server, runs a command +with that server available, and kills the X server when done. The return +value of the command becomes the return value of this script. + +%prep +cp %{SOURCE0} . +%patch0 -p0 + +%build + +%install +install -p -D %{_builddir}/xvfb-run.sh %{buildroot}%{_bindir}/xvfb-run +chmod 755 %{buildroot}%{_bindir}/xvfb-run + +mkdir -p %{buildroot}%{_mandir}/man1/ +cp %{SOURCE1} %{buildroot}%{_mandir}/man1/xvfb-run.1.gz + +%files +%defattr(-,root,root,-) +%{_bindir}/xvfb-run +%{_mandir}/*/xvfb-run.1.gz + +%changelog