SPECS (DEVEL_XFT): emacs.spec - Updated to 23.0.60-0.20080401.1. T...

[qrczak]

Author: qrczak                       Date: Wed Apr  2 22:59:29 2008 GMT
Module: SPECS                         Tag: DEVEL_XFT
---- Log message:
- Updated to 23.0.60-0.20080401.1. This is taken from HEAD in emacs cvs,
  as their XFT_UNICODE branch has been merged to their HEAD.
- This should probably be moved to our DEVEL branch which is now unused
  (older than our HEAD).

---- Files affected:
SPECS:
   emacs.spec (1.68.4.18.2.9 -> 1.68.4.18.2.10) 

---- Diffs:

================================================================
Index: SPECS/emacs.spec
diff -u SPECS/emacs.spec:1.68.4.18.2.9 SPECS/emacs.spec:1.68.4.18.2.10
--- SPECS/emacs.spec:1.68.4.18.2.9	Sat Sep  1 15:01:29 2007
+++ SPECS/emacs.spec	Thu Apr  3 00:59:24 2008
@@ -7,7 +7,7 @@
 %bcond_without	nox	# don't build nox version
 %bcond_without	xft	# don't compile in Xft & freetype support
 #
-%define	snap	20070901
+%define	snap	20080401
 Summary:	The Emacs text editor for the X Window System
 Summary(de.UTF-8):   GNU Emacs
 Summary(es.UTF-8):   GNU Emacs
@@ -16,15 +16,14 @@
 Summary(pt_BR.UTF-8):   GNU Emacs
 Summary(tr.UTF-8):   GNU Emacs
 Name:		emacs
-Version:	23.0.0
+Version:	23.0.60
 Release:	0.%{snap}.1
 License:	GPL
 Group:		Applications/Editors/Emacs
 Source0:	%{name}-%{version}-cvs-%{snap}.tar.bz2
-# Source0-md5:	9f442bd857b96869fc49ee3ab973319a
+# Source0-md5:	559602c9ced41eb6f5ffe0635181a363
 Source1:	%{name}-dot%{name}
 Source2:	%{name}-site-start.el
-Source3:	%{name}.png
 Source4:	%{name}-tuareg.el
 Source5:	%{name}-nemerle.el
 Source6:	%{name}-athena.desktop
@@ -494,7 +493,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_infodir},%{_datadir}/emacs/site-lisp/site-start.d} \
-	$RPM_BUILD_ROOT{%{_desktopdir},/etc/skel,%{_pixmapsdir}} \
+	$RPM_BUILD_ROOT{%{_desktopdir},/etc/skel} \
 
 %if %{with athena}%{with gtk}%{with motif}%{with nox}
 %{makeinstall} -C build-%{bootstrap}
@@ -520,7 +519,6 @@
 
 install site-start.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/skel/.emacs
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/emacs/%{version}/site-lisp/tuareg.el
 install %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/emacs/%{version}/site-lisp/nemerle.el
 install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
@@ -570,7 +568,7 @@
 %attr(755,root,root) %{_bindir}/emacs
 %attr(755,root,root) %{_bindir}/emacs-%{version}
 %{_desktopdir}/emacs-%{default_emacs}.desktop
-%{_pixmapsdir}/*
+%{_iconsdir}/*/*/*/*
 
 %files common
 %defattr(644,root,root,755)
@@ -602,7 +600,9 @@
 %dir %{_datadir}/emacs/%{version}/lisp/mail
 %dir %{_datadir}/emacs/%{version}/lisp/mh-e
 %dir %{_datadir}/emacs/%{version}/lisp/net
+%dir %{_datadir}/emacs/%{version}/lisp/nxml
 %dir %{_datadir}/emacs/%{version}/lisp/obsolete
+%dir %{_datadir}/emacs/%{version}/lisp/org
 %dir %{_datadir}/emacs/%{version}/lisp/play
 %dir %{_datadir}/emacs/%{version}/lisp/progmodes
 %dir %{_datadir}/emacs/%{version}/lisp/term
@@ -642,7 +642,9 @@
 %{_datadir}/emacs/%{version}/lisp/mh-e/*.el.gz
 %{_datadir}/emacs/%{version}/lisp/mh-e/*.elc
 %{_datadir}/emacs/%{version}/lisp/net/*.elc
+%{_datadir}/emacs/%{version}/lisp/nxml/*.elc
 %{_datadir}/emacs/%{version}/lisp/obsolete/*.elc
+%{_datadir}/emacs/%{version}/lisp/org/*.elc
 %{_datadir}/emacs/%{version}/lisp/patcomp.el
 %{_datadir}/emacs/%{version}/lisp/paths.el
 %{_datadir}/emacs/%{version}/lisp/play/*.elc
@@ -722,11 +724,14 @@
 %{_datadir}/emacs/%{version}/lisp/v[f-z]*.el.gz
 %{_datadir}/emacs/%{version}/lisp/language/*.el
 %{_datadir}/emacs/%{version}/lisp/language/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/[c-r]*.el.gz
+%{_datadir}/emacs/%{version}/lisp/mail/[b-r]*.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/[t-z]*.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/smtpmail.el.gz
 %{_datadir}/emacs/%{version}/lisp/mail/supercite.el.gz
+%{_datadir}/emacs/%{version}/lisp/nxml/*.el.gz
+%{_datadir}/emacs/%{version}/lisp/org/*.el.gz
+%{_datadir}/emacs/%{version}/lisp/password-cache.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/[!b]*.el.gz
 %{_datadir}/emacs/%{version}/lisp/play/b[!r]*.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/*-win.el.gz
@@ -735,7 +740,7 @@
 %{_datadir}/emacs/%{version}/lisp/term/tty-colors.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/tvi*.el.gz
 %{_datadir}/emacs/%{version}/lisp/term/vt100.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/sun-mouse.el.gz
+%{_datadir}/emacs/%{version}/lisp/term/w32console.el.gz
 %{_datadir}/emacs/%{version}/lisp/emulation/*.el.gz
 %{_datadir}/emacs/%{version}/lisp/international/*.el
 %{_datadir}/emacs/%{version}/lisp/international/[a-k]*.el.gz
@@ -819,6 +824,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68.4.18.2.10  2008-04-02 22:59:24  qrczak
+- Updated to 23.0.60-0.20080401.1. This is taken from HEAD in emacs cvs,
+  as their XFT_UNICODE branch has been merged to their HEAD.
+- This should probably be moved to our DEVEL branch which is now unused
+  (older than our HEAD).
+
 Revision 1.68.4.18.2.9  2007-09-01 13:01:29  qrczak
 - Updated to 20070901 snap.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/emacs.spec?r1=1.68.4.18.2.9&r2=1.68.4.18.2.10&f=u