Accepting request 768017 from home:namtrac:branches:devel:openQA:tested

Let's retry

OBS-URL: https://build.opensuse.org/request/show/768017
OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/xterm-console?expand=0&rev=4
This commit is contained in:
Oliver Kurz 2020-01-28 12:40:36 +00:00 committed by Git OBS Bridge
parent 2521dc29ae
commit b0a1c3bfa0

View File

@ -1,7 +1,7 @@
# #
# spec file for package xterm # spec file for package xterm-console
# #
# Copyright (c) 2015-2020 SUSE LLC # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -24,29 +24,27 @@ Release: 0
Summary: A Linux vt console look-alike xterm wrapper Summary: A Linux vt console look-alike xterm wrapper
License: MIT License: MIT
Group: System/X11/Utilities Group: System/X11/Utilities
Url: https://github.com/os-autoinst/xterm-console/tree/master URL: https://github.com/os-autoinst/xterm-console
Source: xterm-console Source: xterm-console
Source1: psf2bdf.pl Source1: psf2bdf.pl
BuildRequires: bdftopcf
# svirt, eg. s390x, xen BuildRequires: fontpackages-devel
Supplements: os-autoinst
#BuildRequires: perl #BuildRequires: perl
# the original consolefonts: # the original consolefonts:
BuildRequires: kbd BuildRequires: kbd
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fontpackages-devel
BuildRequires: bdftopcf
Requires: fonts-config Requires: fonts-config
%{reconfigure_fonts_prereq} # svirt, eg. s390x, xen
Supplements: os-autoinst
%reconfigure_fonts_prereq
%description %description
This package contains the basic X.Org terminal program. This package contains the basic X.Org terminal program.
%prep %prep
%setup -c -T %setup -q -c -T
cp %SOURCE1 . cp %{SOURCE1} .
%build %build
# suse 10.x uses older X11 directory structure # suse 10.x uses older X11 directory structure
%if 0%{?suse_version} < 1100 %if 0%{?suse_version} < 1100
@ -57,11 +55,10 @@ cp %SOURCE1 .
%define xfontsd %{_datadir}/fonts %define xfontsd %{_datadir}/fonts
%endif %endif
if ! which bdftopcf &> /dev/null; then exit 1; fi if ! which bdftopcf &> /dev/null; then exit 1; fi
chmod +x ./psf2bdf.pl chmod +x ./psf2bdf.pl
for font in /usr/share/kbd/consolefonts/*.psfu.gz for font in %{_datadir}/kbd/consolefonts/*.psfu.gz
do do
fontname="${font##*/}" fontname="${font##*/}"
fontname="${fontname%.psfu.gz}" fontname="${fontname%.psfu.gz}"
@ -75,16 +72,15 @@ done
%install %install
mkdir -p %{buildroot}%{_prefix}/bin mkdir -p %{buildroot}%{_bindir}
install -m 755 %SOURCE0 %{buildroot}%{_prefix}/bin install -m 755 %{SOURCE0} %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{xfontsd}/misc/ mkdir -p %{buildroot}%{xfontsd}/misc/
install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/ install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/
%{reconfigure_fonts_scriptlets} %reconfigure_fonts_scriptlets
%files %files
%defattr(-,root,root)
%{_bindir}/xterm-console %{_bindir}/xterm-console
%dir %{xfontsd}/misc %dir %{xfontsd}/misc
%{xfontsd}/misc/*.pcf.gz %{xfontsd}/misc/*.pcf.gz