packages: urxvt/urxvt.spec - up to 9.10 - urxvt-fontconfig.patch applied up...

[atler]

Author: atler                        Date: Thu Dec 16 12:12:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 9.10
- urxvt-fontconfig.patch applied upstream
- restore 256colors bcond
- don't pass flags to make - ac/am handles them correctly

---- Files affected:
packages/urxvt:
   urxvt.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/urxvt/urxvt.spec
diff -u packages/urxvt/urxvt.spec:1.56 packages/urxvt/urxvt.spec:1.57
--- packages/urxvt/urxvt.spec:1.56	Thu Nov 25 14:43:34 2010
+++ packages/urxvt/urxvt.spec	Thu Dec 16 13:12:24 2010
@@ -1,16 +1,16 @@
 # $Revision$, $Date$
+%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
+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
-Patch0:		%{name}-fontconfig.patch
 URL:		http://software.schmorp.de/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	fontconfig-devel
@@ -44,13 +44,15 @@
 
 %prep
 %setup -q -n rxvt-unicode-%{version}
-%patch0 -p1
 
 %build
 %{__aclocal} -I.
 %{__autoheader}
 %{__autoconf}
 %configure \
+%if %{with 256colors}
+	--enable-256-color \
+%endif
 	--enable-everything \
 	--enable-mousewheel \
 	--enable-next-scroll \
@@ -58,10 +60,7 @@
 	--disable-afterimage \
 	--enable-smart-resize
 
-%{__make} \
-	CXXFLAGS="%{rpmcxxflags}" \
-	CFLAGS="%{rpmcxxflags}" \
-	LDFLAGS="%{rpmldflags} -lfontconfig"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,6 +91,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2010/12/16 12:12:24  atler
+- up to 9.10
+- urxvt-fontconfig.patch applied upstream
+- restore 256colors bcond
+- don't pass flags to make - ac/am handles them correctly
+
 Revision 1.56  2010/11/25 13:43:34  atler
 - urxvt heavily depends on internal libev so drop BR: libev which was wrong
   anyway
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/urxvt/urxvt.spec?r1=1.56&r2=1.57&f=u