Author: baggins Date: Wed Apr 6 21:37:27 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 21.5.29 and base 2.27
---- Files affected:
packages/xemacs:
xemacs-destdir.patch (1.2 -> 1.3) , xemacs.spec (1.168 -> 1.169)
---- Diffs:
================================================================
Index: packages/xemacs/xemacs-destdir.patch
diff -u packages/xemacs/xemacs-destdir.patch:1.2
packages/xemacs/xemacs-destdir.patch:1.3
--- packages/xemacs/xemacs-destdir.patch:1.2 Sun Apr 2 00:52:27 2006
+++ packages/xemacs/xemacs-destdir.patch Wed Apr 6 23:37:21 2011
@@ -10,7 +10,7 @@
SHELL = /bin/sh
LANG = C
LC_ALL = C
-@@ -378,35 +380,35 @@
+@@ -378,37 +380,37 @@
(cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install
prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
archlibdir=${archlibdir}) ; done
@@ -42,16 +42,20 @@
- ${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 \
================================================================
Index: packages/xemacs/xemacs.spec
diff -u packages/xemacs/xemacs.spec:1.168 packages/xemacs/xemacs.spec:1.169
--- packages/xemacs/xemacs.spec:1.168 Sat Jan 29 01:07:43 2011
+++ packages/xemacs/xemacs.spec Wed Apr 6 23:37:21 2011
@@ -6,9 +6,9 @@
%bcond_with gtk # GTK+ enabled version
#
%define ver 21.5
-%define sver 28
+%define sver 29
%define xver %{ver}-b%{sver}
-%define basepkgver 2.10
+%define basepkgver 2.27
Summary: The XEmacs -- Emacs: The Next Generation
Summary(es.UTF-8): El editor XEmacs
Summary(ja.UTF-8): XEmacs エディタ
@@ -18,13 +18,13 @@
Summary(uk.UTF-8): Версія GNU Emacs для X Window System
Name: xemacs
Version: %{ver}.%{sver}
-Release: 5
+Release: 1
License: GPL
Group: Applications/Editors/Emacs
Source0:
http://ftp.xemacs.org/xemacs/xemacs-%{ver}/%{name}-%{version}.tar.gz
-# Source0-md5: 12e35715c5239c63651a8189973527ab
+# Source0-md5: 5364192ae0d3de23d9f4ce197e6493b5
Source2:
http://ftp.xemacs.org/xemacs/packages/%{name}-base-%{basepkgver}-pkg.tar.gz
-# Source2-md5: aeb02471310ce01a438a7409435410ad
+# Source2-md5: 2ec18d0faf31e2d343f558c730474a63
Source3: %{name}.desktop
Source4: %{name}.ad-pl
Source5: %{name}-default.el
@@ -39,7 +39,7 @@
Patch7: %{name}-level3.patch
Patch8: %{name}-ptmx.patch
Patch9: %{name}-set-locale-to-c-when-not-supported-by-x.patch
-Patch10: %{name}-vendor.patch
+Patch10: %{name}-link.patch
URL: http://www.xemacs.org/
# for X11/bitmaps/gray
BuildRequires: automake
@@ -54,6 +54,7 @@
BuildRequires: texinfo
BuildRequires: xorg-data-xbitmaps
BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXft-devel
BuildRequires: xorg-lib-libXpm-devel
BuildRequires: zlib-devel
# If xemacs is already installed build fails:
@@ -210,6 +211,7 @@
%endif
%build
+%{__autoconf}
cp /usr/share/automake/config.sub .
CFLAGS=" %{rpmcflags}"
CPPFLAGS=" %{rpmcflags}"
@@ -299,6 +301,7 @@
--with-png \
--with-xpm \
--with-gpm \
+ --with-xft \
--with-ncurses \
%if %{with gtk}
--with-gtk \
@@ -502,6 +505,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.169 2011/04/06 21:37:21 baggins
+- updated to 21.5.29 and base 2.27
+
Revision 1.168 2011/01/29 00:07:43 sparky
- dropped pre-cvs changelog
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xemacs/xemacs-destdir.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xemacs/xemacs.spec?r1=1.168&r2=1.169&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
