rpms/xemacs/devel xemacs-21.4.18-utf8-fonts.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xemacs.spec, 1.16, 1.17 xemacs-21-cursor.patch, 1.1, NONE xemacs-21.4.17-innerbuf.patch, 1.1, NONE xemacs-21.4.17-utf8-fonts.patch, 1.2, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Dec 5 11:28:48 UTC 2005
Author: scop
Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24307
Modified Files:
.cvsignore sources xemacs.spec
Added Files:
xemacs-21.4.18-utf8-fonts.patch
Removed Files:
xemacs-21-cursor.patch xemacs-21.4.17-innerbuf.patch
xemacs-21.4.17-utf8-fonts.patch
Log Message:
* Sun Dec 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.18-2
- 21.4.18, innerbuf and cursor patches applied upstream.
xemacs-21.4.18-utf8-fonts.patch:
--- NEW FILE xemacs-21.4.18-utf8-fonts.patch ---
--- xemacs-21.4.18/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200
+++ xemacs-21.4.18/etc/Emacs.ad 2005-12-04 18:07:07.000000000 +0200
@@ -198,20 +198,22 @@
! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0
!
-*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
-*-*-*-*-*-*-*-120-*-iso10646-1, \
-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+ -*-*-*-*-*-*-*-120-*-*-*
*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
-*-*-*-*-*-*-*-120-*-iso10646-1, \
-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+ -*-*-*-*-*-*-*-120-*-*-*
! Gui elements share this font
!
-Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
@@ -227,7 +229,7 @@
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.
-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
! Dialog box translations.
! =======================
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Mar 2005 22:11:36 -0000 1.2
+++ .cvsignore 5 Dec 2005 11:28:45 -0000 1.3
@@ -1 +1 @@
-xemacs-21.4.17.tar.bz2
+xemacs-21.4.18.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Mar 2005 22:11:36 -0000 1.2
+++ sources 5 Dec 2005 11:28:45 -0000 1.3
@@ -1 +1 @@
-a207e106138c085711160855d78b72a2 xemacs-21.4.17.tar.bz2
+08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2
Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xemacs.spec 1 Dec 2005 10:05:26 -0000 1.16
+++ xemacs.spec 5 Dec 2005 11:28:45 -0000 1.17
@@ -7,8 +7,8 @@
%define exectop %{_libdir}/xemacs-%{version}
Name: xemacs
-Version: 21.4.17
-Release: 7%{?dist}
+Version: 21.4.18
+Release: 2%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
@@ -22,16 +22,14 @@
Source22: delprevline.py
Source23: dotxemacs-init.el
Source24: default.el
-Patch0: xemacs-21.4.17-innerbuf.patch
Patch1: xemacs-21.4.17-x-paths.patch
-Patch5: xemacs-21-cursor.patch
Patch10: xemacs-21.4.10-find-paths-pkgdir.patch
Patch11: movemail-mktemp.patch
Patch14: menubar-games.patch
Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch
Patch16: xemacs-21.4.12-mk-nochk-features.patch
Patch18: xemacs-21.4.13-dump-paths-lispdir.patch
-Patch19: xemacs-21.4.17-utf8-fonts.patch
+Patch19: xemacs-21.4.18-utf8-fonts.patch
Patch21: xemacs-debian-docdir-dump.patch
Patch23: xemacs-no-expdyn-ia64-106744.patch
Patch24: xemacs-21.4.15-wnnfix-128362.patch
@@ -40,6 +38,7 @@
BuildRequires: autoconf213
BuildRequires: python
BuildRequires: sed >= 3.95
+BuildRequires: texinfo
BuildRequires: ncurses-devel
BuildRequires: gpm-devel
BuildRequires: pam-devel
@@ -152,7 +151,6 @@
%patch1 -p1
# make find-paths.el look in datadir
-rm lisp/find-paths.elc
%patch10 -p1
# fix "libexec" on multilib
%ifarch x86_64 s390x
@@ -162,13 +160,10 @@
%patch14 -p1
# make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
%patch18 -p1
-rm lisp/dump-paths.elc
sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el
## non-lisp patches ##
-%patch0 -p1 -b .innerbuf
-%patch5 -p1 -b .cursor
# movemail
%patch11 -p1 -b .mkstemp
# skip redundant check-features
@@ -450,6 +445,9 @@
%changelog
+* Sun Dec 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.18-2
+- 21.4.18, innerbuf and cursor patches applied upstream.
+
* Wed Nov 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-7
- Require ISO-8859-1 fonts (Alexandre Oliva, #174617).
- Make popup dialog font the intended one even without ISO-8859 fonts.
--- xemacs-21-cursor.patch DELETED ---
--- xemacs-21.4.17-innerbuf.patch DELETED ---
--- xemacs-21.4.17-utf8-fonts.patch DELETED ---
More information about the fedora-extras-commits
mailing list