Accepting request 266125 from home:dimstar:branches:X11:terminals

Rework my last change - now builds for all repos available in X11:terminals

OBS-URL: https://build.opensuse.org/request/show/266125
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=121
This commit is contained in:
Petr Cerny 2014-12-22 10:59:41 +00:00 committed by Git OBS Bridge
parent d8a7b14d81
commit b65e2c8d0d
2 changed files with 12 additions and 7 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Dec 19 12:57:27 UTC 2014 - dimstar@opensuse.org
- Remove xorg-x11 and xorg-x11-devel BuildRequires: there is no
need, and it causes that xterm requires itself to build through
indirect requires (xdm, xinit).
- Own the directory %{xappdefs}.
-------------------------------------------------------------------
Tue Dec 16 12:10:56 UTC 2014 - dimstar@opensuse.org

View File

@ -66,19 +66,15 @@ BuildRequires: utempter-devel
%else
BuildRequires: utempter
%endif
%if 0%{?suse_version} >= 1000
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
%if 0%{?suse_version} > 1210
# separate package now
BuildRequires: bdftopcf
# post xorg libs split
BuildRequires: libXaw-devel
%endif
%else
BuildRequires: XFree86-devel
BuildRequires: XFree86-libs
BuildRequires: xaw3d
# case for SLE10 and SLE 11
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
%endif
# post xorg apps split
%if 0%{?suse_version} > 1210
@ -215,6 +211,7 @@ install -m 644 *.pcf.gz %{buildroot}%{xfontsd}/misc/
%dir %{xfontsd}/misc
%{xfontsd}/misc/20x20ja.pcf.gz
%{xfontsd}/misc/20x20ko.pcf.gz
%dir %{xappdefs}
%{xappdefs}/KOI8RXTerm
%{xappdefs}/KOI8RXTerm-color
%{xappdefs}/UXTerm