rpms/xemacs/devel xemacs-beta-destdir.patch, NONE, 1.1 xemacs-beta-infodir.patch, NONE, 1.1 xemacs-snapshot.sh, NONE, 1.1 xemacs-21.5.28-courier-default.patch, 1.1, 1.2 xemacs.spec, 1.46, 1.47
Ville Skyttä
scop at fedoraproject.org
Thu Mar 12 17:01:29 UTC 2009
Author: scop
Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27446
Modified Files:
xemacs-21.5.28-courier-default.patch xemacs.spec
Added Files:
xemacs-beta-destdir.patch xemacs-beta-infodir.patch
xemacs-snapshot.sh
Log Message:
* Thu Mar 12 2009 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-13
- Add possibility to build upstream hg snapshots.
- Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune).
- Include Installation{,-nox} in docs.
xemacs-beta-destdir.patch:
--- NEW FILE xemacs-beta-destdir.patch ---
diff -up xemacs-beta/dynodump/Makefile.in.in~ xemacs-beta/dynodump/Makefile.in.in
--- xemacs-beta/dynodump/Makefile.in.in~ 2009-03-08 15:00:21.000000000 +0200
+++ xemacs-beta/dynodump/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200
@@ -22,6 +22,8 @@
## Synched up with: Not synched with FSF.
+DESTDIR=
+
## For performance and consistency, no built-in rules.
.SUFFIXES:
.SUFFIXES: .c .o .i .h
diff -up xemacs-beta/etc/tests/external-widget/Makefile~ xemacs-beta/etc/tests/external-widget/Makefile
--- xemacs-beta/etc/tests/external-widget/Makefile~ 2009-03-08 15:00:22.000000000 +0200
+++ xemacs-beta/etc/tests/external-widget/Makefile 2009-03-08 23:57:58.000000000 +0200
@@ -1,3 +1,5 @@
+DESTDIR=
+
CFLAGS += -Xc -g -DTOOLTALK
EMACSHOME = ../../..
EMACSLIBDIR = $(EMACSHOME)/editor/src
diff -up xemacs-beta/lib-src/Makefile.in.in~ xemacs-beta/lib-src/Makefile.in.in
--- xemacs-beta/lib-src/Makefile.in.in~ 2009-03-08 15:00:23.000000000 +0200
+++ xemacs-beta/lib-src/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200
@@ -24,6 +24,8 @@
## above a certain point in this file are in shell format instead of
## in C format. How the hell is this supposed to work? */
+DESTDIR=
+
## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .h .o
@@ -246,26 +248,26 @@ do-blessmail: $(blessmail)
## just run them directly from lib-src.
${archlibdir}: all
@echo; echo "Installing utilities run internally by XEmacs."
- ./make-path ${archlibdir}
+ ./make-path $(DESTDIR)${archlibdir}
if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
for f in ${PRIVATE_INSTALLABLE_EXES}; do \
- (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \
+ (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \
done ; \
fi
if test "`(cd ${archlibdir} && $(pwd))`" \
!= "`(cd ${srcdir} && $(pwd))`"; then \
for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
+ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \
done ; \
fi
install: ${archlibdir}
@echo; echo "Installing utilities for users to run."
for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
- (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
+ (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \
done
for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \
- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
+ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \
done
uninstall:
diff -up xemacs-beta/lwlib/Makefile.in.in~ xemacs-beta/lwlib/Makefile.in.in
--- xemacs-beta/lwlib/Makefile.in.in~ 2009-03-08 15:00:24.000000000 +0200
+++ xemacs-beta/lwlib/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200
@@ -22,6 +22,8 @@
## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
## Boston, MA 02111-1307, USA.
+DESTDIR=
+
## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .h .o .i .s
diff -up xemacs-beta/Makefile.in.in~ xemacs-beta/Makefile.in.in
--- xemacs-beta/Makefile.in.in~ 2009-03-08 15:00:21.000000000 +0200
+++ xemacs-beta/Makefile.in.in 2009-03-09 00:00:02.000000000 +0200
@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS=
RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
#endif
+DESTDIR=
+
SHELL = /bin/sh
LANG = C
LC_ALL = C
@@ -394,37 +396,37 @@ install-arch-dep: mkdir
(cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
archlibdir=${archlibdir}) ; done
- if test "`(cd ${archlibdir} && $(pwd))`" != \
+ if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != \
"`(cd ./lib-src && $(pwd))`"; then \
if test -f ../Installation; then \
- ${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \
+ ${INSTALL_DATA} ../Installation $(DESTDIR)${archlibdir}/Installation; \
fi; \
- ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \
- ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \
+ ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \
+ ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \
for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
else true; fi
#if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE))
- ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
+ ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
#endif
#ifdef WIN32_NATIVE
- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
- -chmod 0755 ${bindir}/${PROGNAME}
+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}
+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}
#else
# ifdef CYGWIN
- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe
- -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe
- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
- cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME}
+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe
+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
+ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME}
# else
- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
- -chmod 0755 ${bindir}/${PROGNAME}-${version}
- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
- cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}
+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}
+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
+ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
# endif /* CYGWIN */
#endif /* WIN32_NATIVE */
if test "${prefix}" != "${exec_prefix}"; then \
- $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
+ $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \
for dir in \
lib/${inststaticdir} \
lib/${instvardir}/etc \
@@ -435,13 +437,13 @@ install-arch-dep: mkdir
done; \
fi
#ifdef HAVE_SHLIB
- $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir)
+ $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir)
#endif
install-arch-indep: mkdir info
- at set ${COPYDESTS} ; \
for dir in ${COPYDIR} ; do \
- if test "`(cd $$1 && $(pwd))`" != \
+ if test "`(cd $(DESTDIR)$$1 && $(pwd))`" != \
"`(cd $${dir} && $(pwd))`"; then \
: do nothing - echo "rm -rf $$1" ; \
fi ; \
@@ -449,35 +451,35 @@ install-arch-indep: mkdir info
done
-set ${COPYDESTS} ; \
for dir in ${COPYDESTS} ; do \
- if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \
+ if test ! -d $${dir} ; then mkdir $(DESTDIR)$${dir} ; fi ; \
done ; \
for dir in ${COPYDIR} ; do \
dest=$$1 ; shift ; \
test -d $${dir} \
-a "`(cd $${dir} && $(pwd))`" != \
- "`(cd $${dest} && $(pwd))`" \
+ "`(cd $(DESTDIR)$${dest} && $(pwd))`" \
&& (echo "Copying $${dir}..." ; \
(cd $${dir} && $(TAR) -cf - . ) | \
- (cd $${dest} && umask 022 && $(TAR) -xf - );\
- chmod 0755 $${dest}; \
- for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
+ (cd $(DESTDIR)$${dest} && umask 022 && $(TAR) -xf - );\
+ chmod 0755 $(DESTDIR)$${dest}; \
+ for subdir in `find $(DESTDIR)$${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
(cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \
done) ; \
done
if test "`(cd ${srcdir}/info && $(pwd))`" != \
- "`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \
- if test ! -f ${infodir}/dir -a -f dir ; then \
- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \
+ "`(cd $(DESTDIR)${infodir} && $(pwd))`" && cd ${srcdir}/info; then \
+ if test ! -f $(DESTDIR)${infodir}/dir -a -f dir ; then \
+ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \
fi ; \
for file in *.info* ; do \
- ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \
- chmod 0644 ${infodir}/$${file}; \
+ ${INSTALL_DATA} $${file} $(DESTDIR)${infodir}/$${file} ; \
+ chmod 0644 $(DESTDIR)${infodir}/$${file}; \
done ; \
fi
cd ${srcdir}/etc && \
for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
- chmod 0644 ${mandir}/$${page}${manext} ; \
+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \
+ chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \
done
@echo "If you would like to save approximately 4M of disk space, do"
@echo "make gzip-el"
@@ -487,19 +489,23 @@ install-arch-indep: mkdir info
@echo "${lispdir}"
gzip-el:
- $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir}
+ $(SHELL) ${srcdir}/lib-src/gzip-el.sh $(DESTDIR)${lispdir}
## Build all the directories to install XEmacs in.
## Since we may be creating several layers of directories,
## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use
## make-path instead of mkdir. Not all mkdirs have the `-p' flag.
mkdir: FRC.mkdir
- ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \
- ${mandir} ${bindir} ${datadir} ${libdir} \
+ for dir in \
+ ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \
+ ${mandir} ${bindir} ${datadir} ${libdir} \
#ifdef HAVE_SHLIB
- ${moduledir} ${sitemoduledir} \
+ ${moduledir} ${sitemoduledir} \
#endif
- ${sitelispdir}
+ ${sitelispdir} ; \
+ do \
+ ${MAKEPATH} $(DESTDIR)$${dir} ; \
+ done ;
## Install bundled packages, if present.
diff -up xemacs-beta/man/Makefile~ xemacs-beta/man/Makefile
--- xemacs-beta/man/Makefile~ 2009-03-08 15:00:24.000000000 +0200
+++ xemacs-beta/man/Makefile 2009-03-08 23:57:58.000000000 +0200
@@ -20,6 +20,8 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
+DESTDIR=
+
SHELL = /bin/sh
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
diff -up xemacs-beta/modules/base64/Makefile~ xemacs-beta/modules/base64/Makefile
--- xemacs-beta/modules/base64/Makefile~ 2009-03-08 15:00:25.000000000 +0200
+++ xemacs-beta/modules/base64/Makefile 2009-03-08 23:57:58.000000000 +0200
@@ -7,6 +7,8 @@
# 'installed'.
#
+DESTDIR=
+
SHELL=/bin/sh
RM=rm -f
CC=../../lib-src/ellcc
diff -up xemacs-beta/modules/common/Makefile.common~ xemacs-beta/modules/common/Makefile.common
--- xemacs-beta/modules/common/Makefile.common~ 2009-03-08 15:00:25.000000000 +0200
+++ xemacs-beta/modules/common/Makefile.common 2009-03-08 23:57:58.000000000 +0200
@@ -31,6 +31,8 @@
#define NOT_C_CODE
#include "../../src/config.h"
+DESTDIR=
+
SHELL=/bin/sh
RM=rm -f
PROGNAME=@PROGNAME@
@@ -98,7 +100,7 @@ extraclean: realclean
-$(RM) *~ \#*
install: $(OBJECT_TO_BUILD)
- $(INSTALL_PROGRAM) $< $(INSTALLPATH)
+ $(INSTALL_PROGRAM) $< $(DESTDIR)$(INSTALLPATH)
##
## Local Variables:
diff -up xemacs-beta/modules/zlib/Makefile~ xemacs-beta/modules/zlib/Makefile
--- xemacs-beta/modules/zlib/Makefile~ 2009-03-08 15:00:25.000000000 +0200
+++ xemacs-beta/modules/zlib/Makefile 2009-03-08 23:57:58.000000000 +0200
@@ -8,6 +8,8 @@
# 'installed'.
#
+DESTDIR=
+
SHELL=/bin/sh
RM=rm -f
CC=../../lib-src/ellcc
diff -up xemacs-beta/netinstall/Makefile.in.in~ xemacs-beta/netinstall/Makefile.in.in
--- xemacs-beta/netinstall/Makefile.in.in~ 2009-03-08 15:00:25.000000000 +0200
+++ xemacs-beta/netinstall/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200
@@ -14,6 +14,8 @@
##
## Makefile for Cygwin installer
+DESTDIR=
+
## For performance and consistency, no built-in rules
.SUFFIXES:
.SUFFIXES: .c .cc .h .o
@@ -173,7 +175,7 @@ setup-bin.ini:
install:
@echo; echo "Installing net setup."
for file in ${INSTALLABLES} ; do \
- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \
+ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \
done
version.c : $(srcdir)/ChangeLog Makefile
diff -up xemacs-beta/src/Makefile.in.in~ xemacs-beta/src/Makefile.in.in
--- xemacs-beta/src/Makefile.in.in~ 2009-03-08 15:00:26.000000000 +0200
+++ xemacs-beta/src/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200
@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS=
RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@
#endif
+DESTDIR=
+
PROGNAME=@PROGNAME@
prefix=@prefix@
SRC=@srcdir@
@@ -1065,7 +1067,7 @@ relock:
#ifdef HAVE_SHLIB
MAKEPATH=../lib-src/make-path
install: $(PROGNAME)
- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s
+ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s
- at echo "Copying include files for ellcc..."
- at hdir=`pwd`; \
cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \
@@ -1079,12 +1081,12 @@ install: $(PROGNAME)
test -d s && hdrtars="$$hdrtars s/*"; \
test -d m && hdrtars="$$hdrtars m/*"; \
test -n "$$hdrtars" && (tar cf - $$hdrtars) | \
- (cd $(archlibdir)/include && umask 022 && tar xf -); \
- chmod 755 $(archlibdir)/include; \
- test -d $(archlibdir)/include/s && \
- chmod 755 $(archlibdir)/include/s; \
- test -d $(archlibdir)/include/m && \
- chmod 755 $(archlibdir)/include/s;) \
+ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \
+ chmod 755 $(DESTDIR)$(archlibdir)/include; \
+ test -d $(DESTDIR)$(archlibdir)/include/s && \
+ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \
+ test -d $(DESTDIR)$(archlibdir)/include/m && \
+ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \
done)
#endif
diff -up xemacs-beta/tests/tooltalk/Makefile~ xemacs-beta/tests/tooltalk/Makefile
--- xemacs-beta/tests/tooltalk/Makefile~ 2009-03-08 15:00:28.000000000 +0200
+++ xemacs-beta/tests/tooltalk/Makefile 2009-03-08 23:57:58.000000000 +0200
@@ -12,6 +12,8 @@
### Code:
+DESTDIR=
+
CC = cc -Xc
CPPFLAGS = -I/usr/openwin/include
CFLAGS = -g -v -DNeedFunctionPrototypes
xemacs-beta-infodir.patch:
--- NEW FILE xemacs-beta-infodir.patch ---
diff -up xemacs-beta/configure.ac~ xemacs-beta/configure.ac
--- xemacs-beta/configure.ac~ 2009-03-08 15:00:21.000000000 +0200
+++ xemacs-beta/configure.ac 2009-03-09 23:39:52.000000000 +0200
@@ -1090,7 +1090,7 @@ then
AC_DEFINE(DOCDIR_USER_DEFINED)
fi
-if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
+if test "x$infodir" != 'x${datarootdir}/info'
then
AC_DEFINE(INFODIR_USER_DEFINED)
else
--- NEW FILE xemacs-snapshot.sh ---
#!/bin/bash
set -e
if [ -z "$1" -o $# -ne 1 ]; then
echo "Usage: $0 <hg-revision>"
exit 2
fi
rev="$1"
tmp=$(mktemp -d)
tarball="xemacs-$(date +%Y%m%d)hg$rev.tar"
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
now=$(date +%Y%m%d)
cd "$tmp"
hg clone http://hg.debian.org/hg/xemacs/xemacs-beta
cd xemacs-beta
hg update -r "$rev"
# Hack to avoid needing .hg/ around but still getting xemacs-extra-name right
hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac
rm -r .hg*
cd ..
tar cf "$pwd/$tarball" xemacs-beta
lzma -f "$pwd/$tarball"
cd - >/dev/null
xemacs-21.5.28-courier-default.patch:
Index: xemacs-21.5.28-courier-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs-21.5.28-courier-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-21.5.28-courier-default.patch 21 May 2007 15:16:54 -0000 1.1
+++ xemacs-21.5.28-courier-default.patch 12 Mar 2009 17:01:29 -0000 1.2
@@ -1,16 +1,7 @@
--- src/faces.c 22 Apr 2007 19:58:59 -0000 1.55
+++ src/faces.c 21 May 2007 14:51:50 -0000
-@@ -2397,11 +2397,12 @@
- THAT WAS A GOOD IDEA?!?!) The other fonts that used to be specified
- here gave horrendous results. */
-
-+ /* Fedora change: no such issues here, back to courier for backcompat. */
- inst_list =
- Fcons
- (Fcons
+@@ -2399,3 +2399,3 @@
(list1 (device_symbol),
- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
+ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
inst_list);
-
- #endif /* !USE_XFT */
Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xemacs.spec 8 Mar 2009 20:24:26 -0000 1.46
+++ xemacs.spec 12 Mar 2009 17:01:29 -0000 1.47
@@ -1,4 +1,4 @@
-# TODO: review desktop entry associations
+# TODO: review desktop entry associations (does text/* work?)
# TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el
# TODO: non-ASCII in buffer tabs
@@ -16,15 +16,21 @@
%bcond_without modules
%endif
+#global snap 20090311hg4626
+
Name: xemacs
Version: 21.5.28
-Release: 12%{?dist}
+Release: 13%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
License: GPLv2+
URL: http://www.xemacs.org/
+%if 0%{?snap:1}
+Source0: %{name}-%{snap}.tar.lzma
+%else
Source0: http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
+%endif
Source1: %{name}.png
Source2: xemacs.desktop
Source3: dotxemacs-init.el
@@ -33,23 +39,38 @@
Patch0: %{name}-21.5.26-utf8-fonts.patch
Patch1: %{name}-21.5.25-x-paths.patch
+# Upstreamed post 21.5.28
Patch2: %{name}-21.5.28-doc-encodings.patch
Patch3: %{name}-21.5.25-mk-nochk-features.patch
Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch
Patch5: %{name}-21.5.25-wnnfix-128362.patch
+# Upstreamed post 21.5.28
# http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html
Patch6: %{name}-21.5.26-gtk-gcc4.patch
+# Upstreamed post 21.5.28
Patch7: %{name}-21.5.27-finder-lisp-dir.patch
Patch8: %{name}-21.5.28-courier-default.patch
+%if 0%{?snap:1}
+Patch9: %{name}-beta-destdir.patch
+%else
Patch9: %{name}-21.5.28-destdir.patch
+%endif
+# Upstreamed post 21.5.28
Patch10: %{name}-21.5.28-revert-modified-245017.patch
+# Upstreamed post 21.5.28
Patch11: %{name}-21.5.28-autoconf262-449626.patch
+# Upstreamed post 21.5.28
Patch12: %{name}-21.5.28-3d-athena.patch
-# From upstream hg
+# From upstream hg post 21.5.28
Patch13: %{name}-21.5.28-xemacs-base-autoloads.patch
+# Sent upstream 2009-03-12
+Patch14: %{name}-beta-infodir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?snap:1}
+BuildRequires: lzma
+%endif
BuildRequires: autoconf
BuildRequires: sed >= 3.95
BuildRequires: texinfo
@@ -91,6 +112,7 @@
Requires: %{name}-common = %{version}-%{release}
Requires: xorg-x11-fonts-ISO8859-1-75dpi
Requires: xorg-x11-fonts-ISO8859-1-100dpi
+Requires: xorg-x11-fonts-misc
Requires(post): coreutils
Provides: xemacs(bin) = %{version}-%{release}
@@ -190,13 +212,12 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}}
find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f
rm -f configure.in
sed -i -e /tetris/d lisp/menubar-items.el
%patch0 -p1
%patch1 -p1
-%patch2 -p0
%patch3 -p1
%ifarch ia64
touch -r aclocal.m4 aclocal.m4-stamp
@@ -204,14 +225,19 @@
touch -r aclocal.m4-stamp aclocal.m4
%endif
%patch5 -p1
+%patch8 -p0 -F 1
+%patch9 -p1
+%if 0%{?snap:1}
+%patch14 -p1
+%else
+%patch2 -p0
%patch6 -p1
%patch7 -p0
-%patch8 -p0
-%patch9 -p1
%patch10 -p0
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%endif
sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
@@ -276,6 +302,7 @@
mv lib-src/DOC{,-nox}
mv src/xemacs{,-nox-%{xver}}
mv lib-src/config.values{,-nox}
+mv Installation{,-nox}
# grab these from -nox, the X ones may have deps on ALSA, X, etc
for file in {e,oo}tags gnuserv {fake,move}mail yow ; do
mv lib-src/$file{,-mindep}
@@ -482,6 +509,7 @@
%files
%defattr(-,root,root,-)
+%doc Installation
# gnuclient needs X libs, so not in -common
%{_bindir}/gnuclient
%{_bindir}/gnudoit
@@ -501,6 +529,7 @@
%if %{with nox}
%files nox
%defattr(-,root,root,-)
+%doc Installation-nox
%ghost %{_bindir}/xemacs
%{_bindir}/xemacs-nox
%{_bindir}/xemacs-nox-%{xver}
@@ -514,6 +543,7 @@
%doc etc/editclient.sh
%{_bindir}/etags.xemacs
%{_bindir}/ootags
+%{_bindir}/xemacs-script
%dir %{_libdir}/xemacs-%{xver}/
%dir %{_libdir}/xemacs-%{xver}/%{xbuild}/
%{_libdir}/xemacs-%{xver}/%{xbuild}/[acdfghprsvwy]*
@@ -550,6 +580,11 @@
%changelog
+* Thu Mar 12 2009 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-13
+- Add possibility to build upstream hg snapshots.
+- Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune).
+- Include Installation{,-nox} in docs.
+
* Sun Mar 8 2009 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-12
- Make XFontSet support optional at build time and disable it by default
to work around #478370.
More information about the scm-commits
mailing list