- updated to 300

[packages/xterm.git] / xterm.spec

diff --git a/xterm.spec b/xterm.spec
index af936d82f1a7f304a78697a35d89ff786c1fe499..0ba72855f2e0fe9d178a720e9b385a28afcb2ae4 100644 (file)
--- a/xterm.spec
+++ b/xterm.spec
@@ -1,20 +1,21 @@
 Summary:       Terminal emulator for X
 Summary(pl.UTF-8):     Emulator terminala dla X
 Name:          xterm
-Version:       252
+Version:       300
 Release:       1
 License:       MIT
 Group:         X11/Applications
 Source0:       ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
-# Source0-md5: b92777f7adbb2aa4c9029752ab24fee1
+# Source0-md5: 6adc7c7f39ab2a71fd83747049d60358
 Source1:       XTerm.ad-pl
 Source2:       %{name}.desktop
 Source3:       %{name}.png
 Source4:       %{name}.1x.ko
+Patch0:                %{name}-tinfo.patch
 URL:           http://invisible-island.net/xterm/
+BuildRequires: libutempter-devel
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
-BuildRequires: utempter-devel
 BuildRequires: xorg-lib-libXaw-devel
 BuildRequires: xorg-lib-libXft-devel
 Requires:      xorg-lib-libXt >= 1.0.0
@@ -40,17 +41,18 @@ sekwencji sterujących VT220.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-CPPFLAGS="-I/usr/include/ncurses"
+# don't run autoconf, modified version of autoconf is required
+CPPFLAGS="-I/usr/include/ncurses %{rpmcppflags}"
 %configure \
        --enable-256-color \
        --enable-wide-chars \
        --with-app-defaults=%{_datadir}/X11/app-defaults \
        --with-utempter
 
-%{__make} \
-       EXTRA_LOADFLAGS="-ltinfo"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +68,9 @@ install -D %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}/xterm.png
 install -D %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/ko/man1/xterm.1
 echo '.so xterm.1' > $RPM_BUILD_ROOT%{_mandir}/ko/man1/uxterm.1
 
+# cleanup unpackaged icons
+%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/{filled-xterm,mini.xterm,xterm-color,xterm}_*x*.xpm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,9 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/uxterm
 %attr(755,root,root) %{_bindir}/koi8rxterm
 %{_datadir}/X11/app-defaults/UXTerm
+%{_datadir}/X11/app-defaults/UXTerm-color
 %{_datadir}/X11/app-defaults/XTerm
 %{_datadir}/X11/app-defaults/XTerm-color
 %{_datadir}/X11/app-defaults/KOI8RXTerm
+%{_datadir}/X11/app-defaults/KOI8RXTerm-color
 %lang(pl) %{_datadir}/X11/pl/app-defaults/XTerm
 %{_desktopdir}/xterm.desktop
 %{_pixmapsdir}/xterm.png