Build for modular X11: fix app-defaults and BuildRequires
This commit is contained in:
parent
0b0f7dd6c9
commit
48344af791
64
xterm.spec
64
xterm.spec
@ -1,26 +1,35 @@
|
||||
%{?!modularX11: %define modularX11 1}
|
||||
%if %{modularX11}
|
||||
%define _x11bindir /usr/bin/X11
|
||||
%define _x11datadir /usr/lib
|
||||
%else
|
||||
%define _x11bindir /usr/X11R6/bin
|
||||
%define _x11datadir /usr/X11R6/lib
|
||||
%endif
|
||||
Summary: xterm terminal emulator for the X Window System
|
||||
Name: xterm
|
||||
Name: xterm
|
||||
Version: 206
|
||||
Release: 2
|
||||
URL: http://dickey.his.com/xterm
|
||||
Release: 3
|
||||
URL: http://dickey.his.com/xterm
|
||||
License: MIT
|
||||
Group: User Interface/X
|
||||
Group: User Interface/X
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
Source0: ftp://dickey.his.com/xterm/%{name}-%{version}.tgz
|
||||
Patch0: xterm-can-2003-0063.patch
|
||||
Patch1: xterm-resources-redhat.patch
|
||||
Patch2: xterm-179-ppc-fix-bug-101472.patch
|
||||
Patch3: xterm-tty-group-name.patch
|
||||
Patch4: xterm-206-appsdir.patch
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: utempter libtermcap-devel
|
||||
BuildRequires: libXft-devel
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: libXrender-devel
|
||||
BuildRequires: libXaw-devel
|
||||
BuildRequires: libXmu-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libICE-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXpm-devel
|
||||
BuildRequires: libtermcap-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libtermcap-devel
|
||||
BuildRequires: utempter
|
||||
|
||||
%description
|
||||
The xterm program is a terminal emulator for the X Window System. It
|
||||
@ -34,10 +43,8 @@ programs that can't use the window system directly.
|
||||
#chmod -R u+w .
|
||||
%patch0 -p0 -b .can-2003-0063
|
||||
%patch1 -p1 -b .resources-redhat
|
||||
%ifarch ppc ppc64
|
||||
#%patch2 -p0 -b .ppc-fix-bug-101472
|
||||
%endif
|
||||
%patch3 -p1 -b .tty-group-name
|
||||
%patch4 -p1 -b .appsdir
|
||||
|
||||
%build
|
||||
%configure --enable-luit \
|
||||
@ -45,29 +52,17 @@ programs that can't use the window system directly.
|
||||
--enable-wide-chars \
|
||||
--with-utempter \
|
||||
--disable-tek4014 \
|
||||
%{?modularX11: --enable-narrowproto} \
|
||||
--enable-narrowproto \
|
||||
--with-app-defaults=%{_datadir}/X11/app-defaults \
|
||||
%{?_with_256_color:--enable-256-color};
|
||||
export XTERM_TTY_GROUP_NAME=tty;
|
||||
make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%makeinstall
|
||||
#install-ti
|
||||
|
||||
%makeinstall appsdir=$RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults
|
||||
|
||||
mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
|
||||
#mv $RPM_BUILD_ROOT/usr/%{_lib}/X11/app-defaults/* $RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults/
|
||||
|
||||
# Make a compatibility symlink for xterm, so that applications and scripts
|
||||
# which invoke xterm explicitly as /usr/X11R6/bin/xterm, will continue to work
|
||||
# correctly without surprises
|
||||
{
|
||||
mkdir -p $RPM_BUILD_ROOT%{_x11bindir}
|
||||
ln -sf /usr/bin/xterm $RPM_BUILD_ROOT%{_x11bindir}/xterm
|
||||
}
|
||||
|
||||
%clean
|
||||
#rm -rf $RPM_BUILD_ROOT
|
||||
@ -79,10 +74,9 @@ mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
|
||||
%{_bindir}/xterm
|
||||
%{_mandir}/man1/resize.1*
|
||||
%{_mandir}/man1/xterm.1*
|
||||
%{_x11datadir}/X11/app-defaults/UXTerm
|
||||
%{_x11datadir}/X11/app-defaults/XTerm
|
||||
%{_x11datadir}/X11/app-defaults/XTerm-color
|
||||
%{_x11bindir}/xterm
|
||||
%{_datadir}/X11/app-defaults/UXTerm
|
||||
%{_datadir}/X11/app-defaults/XTerm
|
||||
%{_datadir}/X11/app-defaults/XTerm-color
|
||||
|
||||
%changelog
|
||||
* Fri Nov 04 2005 Jason Vas Dias <jvdias@redhat.com> 206-1
|
||||
|
Loading…
Reference in New Issue
Block a user