- fontconfig linking patch (fixes TODO)

[packages/urxvt.git] / urxvt.spec

diff --git a/urxvt.spec b/urxvt.spec
index e5f2ee7d5dbd4c0a2a1caf6ab8aba79029805e9d..6edece0dc5a6c344de18e0ae3153fb01d0264612 100644 (file)
--- a/urxvt.spec
+++ b/urxvt.spec
@@ -1,21 +1,19 @@
-#
-# Conditional build:
-#
-%bcond_with     256colors # unsupported 256 colors patch (see FAQ)
 %include       /usr/lib/rpm/macros.perl
 Summary:       Rxvt terminal with unicode support and some improvements
 Summary(pl.UTF-8):     Terminal Rxvt z obsługą unicode i kilkoma usprawnieniami
 Name:          urxvt
-Version:       9.07
+Version:       9.09
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-%{version}.tar.bz2
-# Source0-md5: 49bb52c99e002bf85eb41d8385d903b5
+# Source0-md5: 3505887adae710382edee90ed5538a01
 Source1:       %{name}.desktop
+Patch0:                %{name}-fontconfig.patch
 URL:           http://software.schmorp.de/
 BuildRequires: autoconf >= 2.50
 BuildRequires: fontconfig-devel
+BuildRequires: libev >= 4.0
 BuildRequires: libstdc++-devel
 BuildRequires: perl-devel
 BuildRequires: pkgconfig
@@ -46,17 +44,13 @@ URxvt jest modyfikacją Rxvt uwzględniającą:
 
 %prep
 %setup -q -n rxvt-unicode-%{version}
-%if %{with 256colors}
-patch -p1 < doc/urxvt-8.2-256color.patch
-%endif
+%patch0 -p1
 
 %build
+%{__aclocal} -I.
 %{__autoheader}
 %{__autoconf}
 %configure \
-%if %{with 256colors}
-       --enable-xterm-colors=256 \
-%endif
        --enable-everything \
        --enable-mousewheel \
        --enable-next-scroll \
@@ -66,7 +60,8 @@ patch -p1 < doc/urxvt-8.2-256color.patch
 
 %{__make} \
        CXXFLAGS="%{rpmcxxflags}" \
-       CFLAGS="%{rpmcxxflags}"
+       CFLAGS="%{rpmcxxflags}" \
+       LDFLAGS="%{rpmldflags} -lfontconfig"
 
 %install
 rm -rf $RPM_BUILD_ROOT