X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=urxvt.spec;h=1505ddbd796996557daf8a24e76a70d09a04e204;hb=0a040d64a548a365278e6c155cd19d868e14608a;hp=221b5342759b44c8fbcd0806a1224b681c5e1587;hpb=1ac6a3fd01bd113486faf773124d4e70ac6643eb;p=packages%2Furxvt.git

diff --git a/urxvt.spec b/urxvt.spec
index 221b534..1505ddb 100644
--- a/urxvt.spec
+++ b/urxvt.spec
@@ -1,27 +1,19 @@
-# TODO:
-# - Build fails on all platforms, same error for previous TH/TI built version 9.07
-#		/usr/bin/ld: rxvtfont.o: undefined reference to symbol 'FcPatternDel'
-#		/usr/bin/ld: note: 'FcPatternDel' is defined in DSO /usr/lib64/libfontconfig.so so try adding it to the linker command line
-#		/usr/lib64/libfontconfig.so: could not read symbols: Invalid operation
-#
-# Conditional build:
-#
+%bcond_with	256colors	# build with 256 color support
 %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.09
-Release:	0.1
+Version:	9.10
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-%{version}.tar.bz2
-# Source0-md5:	3505887adae710382edee90ed5538a01
+# Source0-md5:	a23aa40b31e843878b6f9c44768de430
 Source1:	%{name}.desktop
 URL:		http://software.schmorp.de/
 BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
 BuildRequires:	fontconfig-devel
-BuildRequires:	fontconfig-libs
-BuildRequires:	libev >= 4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
@@ -54,9 +46,13 @@ URxvt jest modyfikacją Rxvt uwzględniającą:
 %setup -q -n rxvt-unicode-%{version}
 
 %build
+%{__aclocal} -I.
 %{__autoheader}
 %{__autoconf}
 %configure \
+%if %{with 256colors}
+	--enable-256-color \
+%endif
 	--enable-everything \
 	--enable-mousewheel \
 	--enable-next-scroll \
@@ -64,10 +60,7 @@ URxvt jest modyfikacją Rxvt uwzględniającą:
 	--disable-afterimage \
 	--enable-smart-resize
 
-%{__make} \
-	CXXFLAGS="%{rpmcxxflags}" \
-	CFLAGS="%{rpmcxxflags}" \
-	LDFLAGS="%{rpmldflags} -lfontconfig"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT