Author: qrczak Date: Tue Feb 6 09:31:49 2007 GMT
Module: SPECS Tag: DEVEL_XFT
---- Log message:
- Updated to 20070201 snapshot
- emacs-ncurses-tinfo.patch: link tinfo instead of ncurses to make it
work in a terminal
- emacs-enable-font-backend.patch: --enable-font-backend is the default,
use --disable-font-backend to override
- --with xft / --without xft should give consistent results no matter
whether Xft and freetype are installed
---- Files affected:
SPECS:
emacs.spec (1.68.4.18.2.2 -> 1.68.4.18.2.3)
---- Diffs:
================================================================
Index: SPECS/emacs.spec
diff -u SPECS/emacs.spec:1.68.4.18.2.2 SPECS/emacs.spec:1.68.4.18.2.3
--- SPECS/emacs.spec:1.68.4.18.2.2 Mon Feb 5 14:32:51 2007
+++ SPECS/emacs.spec Tue Feb 6 10:31:43 2007
@@ -5,9 +5,9 @@
%bcond_without gtk # don't build GTK2 version
%bcond_without motif # don't build motif version
%bcond_without nox # don't build nox version
-%bcond_without xft # don't compile in Freetype support
+%bcond_without xft # don't compile in Xft & freetype support
#
-%define snap 20061115
+%define snap 20070201
Summary: The Emacs text editor for the X Window System
Summary(de): GNU Emacs
Summary(es): GNU Emacs
@@ -17,7 +17,7 @@
Summary(tr): GNU Emacs
Name: emacs
Version: 23.0.0
-Release: 0.%{snap}.2
+Release: 0.%{snap}.1
License: GPL
Group: Applications/Editors/Emacs
Source0: %{name}-%{version}-cvs-%{snap}.tar.bz2
@@ -31,6 +31,8 @@
Source7: %{name}-gtk.desktop
Source8: %{name}-motif.desktop
Source9: %{name}-nox.desktop
+Patch0: %{name}-ncurses-tinfo.patch
+Patch1: %{name}-enable-font-backend.patch
URL: http://www.gnu.org/software/emacs/
BuildRequires: autoconf
BuildRequires: automake
@@ -44,7 +46,7 @@
%{?with_athena:BuildRequires: Xaw3d-devel >= 1.5E-3}
%{?with_gtk:BuildRequires: gtk+2-devel}
%{?with_motif:BuildRequires: openmotif-devel}
-%{?with_xft:BuildRequires: freetype-devel}
+%{?with_xft:BuildRequires: xorg-lib-libXft-devel}
BuildRequires: sed >= 4.0
BuildRequires: texinfo
Requires: ctags
@@ -369,6 +371,8 @@
echo -e "\nEmacs %{default_emacs} version will be emacs binary as default.\n"
#
%setup -q -n %{name}
+%patch0 -p1
+%patch1 -p1
%build
cp -f /usr/share/automake/config.* .
@@ -390,8 +394,11 @@
--with-gif \
--with-png \
%if %{with xft}
- --with-freetype \
+ --with-xft \
--enable-font-backend \
+%else
+ --without-xft \
+ --without-freetype \
%endif
--with-x-toolkit=athena
@@ -412,8 +419,11 @@
--with-gif \
--with-png \
%if %{with xft}
- --with-freetype \
+ --with-xft \
--enable-font-backend \
+%else
+ --without-xft \
+ --without-freetype \
%endif
--with-x-toolkit=gtk
@@ -438,8 +448,11 @@
--with-gif \
--with-png \
%if %{with xft}
- --with-freetype \
+ --with-xft \
--enable-font-backend \
+%else
+ --without-xft \
+ --without-freetype \
%endif
--with-x-toolkit=motif
@@ -808,6 +821,15 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.68.4.18.2.3 2007/02/06 09:31:43 qrczak
+- Updated to 20070201 snapshot
+- emacs-ncurses-tinfo.patch: link tinfo instead of ncurses to make it
+ work in a terminal
+- emacs-enable-font-backend.patch: --enable-font-backend is the default,
+ use --disable-font-backend to override
+- --with xft / --without xft should give consistent results no matter
+ whether Xft and freetype are installed
+
Revision 1.68.4.18.2.2 2007/02/05 13:32:51 japhy
- Rel up to reload dropin
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/emacs.spec?r1=1.68.4.18.2.2&r2=1.68.4.18.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
