Author: arekm Date: Fri Jul 31 08:46:55 2009 GMT Module: packages Tag: HEAD ---- Log message: - 23.1; files need update
---- Files affected: packages/emacs: emacs-lib64.patch (1.1 -> 1.2) , emacs.spec (1.94 -> 1.95) ---- Diffs: ================================================================ Index: packages/emacs/emacs-lib64.patch diff -u packages/emacs/emacs-lib64.patch:1.1 packages/emacs/emacs-lib64.patch:1.2 --- packages/emacs/emacs-lib64.patch:1.1 Thu Jan 3 18:22:14 2008 +++ packages/emacs/emacs-lib64.patch Fri Jul 31 10:46:49 2009 @@ -1,23 +1,21 @@ --- emacs-22.1/src/s/gnu-linux.h.orig 2008-01-03 13:12:45.000000000 +0000 +++ emacs-22.1/src/s/gnu-linux.h 2008-01-03 13:13:20.000000000 +0000 -@@ -190,9 +190,9 @@ +@@ -168,7 +168,7 @@ + /* Ask GCC where to find libgcc.a. */ + #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name` - #ifndef __ELF__ - /* GNU/Linux usually has crt0.o in a non-standard place */ --#define START_FILES pre-crt0.o /usr/lib/crt0.o -+#define START_FILES pre-crt0.o /usr/lib64/crt0.o - #else -#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o +#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o - #endif - #ifdef __ELF__ -@@ -244,7 +244,7 @@ - #else + /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option + says where to find X windows at run time. */ +@@ -198,7 +198,7 @@ + #define LIBS_DEBUG #undef LIB_GCC #define LIB_GCC -#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o - #endif /* Don't use -g in test compiles in configure. + This is so we will use the same shared libs for that linking + ================================================================ Index: packages/emacs/emacs.spec diff -u packages/emacs/emacs.spec:1.94 packages/emacs/emacs.spec:1.95 --- packages/emacs/emacs.spec:1.94 Sun Jul 12 15:14:14 2009 +++ packages/emacs/emacs.spec Fri Jul 31 10:46:49 2009 @@ -14,12 +14,12 @@ Summary(pt_BR.UTF-8): GNU Emacs Summary(tr.UTF-8): GNU Emacs Name: emacs -Version: 22.3 -Release: 3 +Version: 23.1 +Release: 0.1 License: GPL v3+ Group: Applications/Editors/Emacs Source0: ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.gz -# Source0-md5: aa8ba34f548cd78b35914ae5a7bb87eb +# Source0-md5: a620d4452769d04ad8864d662f34f8dd Source1: %{name}-dot%{name} Source2: %{name}-site-start.el Source3: %{name}.png @@ -34,6 +34,7 @@ URL: http://www.gnu.org/software/emacs/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: freetype-devel %{?with_gtk:BuildRequires: gtk+2-devel} BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -47,6 +48,7 @@ BuildRequires: xorg-lib-libX11-devel %{?with_athena:BuildRequires: xorg-lib-libXaw-devel} BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXft-devel BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-lib-libXpm-devel Requires: %{name}-common = %{version}-%{release} @@ -626,7 +628,6 @@ %{_datadir}/emacs/%{version}/lisp/term/AT386.el %{_datadir}/emacs/%{version}/lisp/term/apollo.el %{_datadir}/emacs/%{version}/lisp/term/bobcat.el -%{_datadir}/emacs/%{version}/lisp/term/internal.el %{_datadir}/emacs/%{version}/lisp/term/iris-ansi.el %{_datadir}/emacs/%{version}/lisp/term/linux.el %{_datadir}/emacs/%{version}/lisp/term/lk201.el @@ -641,7 +642,6 @@ %{_datadir}/emacs/%{version}/lisp/term/xterm.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/*.elc %{_datadir}/emacs/%{version}/lisp/international/*.elc -%{_datadir}/emacs/%{version}/lisp/international/latin-*.el %{_datadir}/emacs/%{version}/lisp/international/mule-conf.el %{_datadir}/emacs/%{version}/lisp/international/latexenc.el.gz %{_datadir}/emacs/%{version}/lisp/calendar/*.elc @@ -679,7 +679,6 @@ %files el %defattr(644,root,root,755) -%{_datadir}/emacs/%{version}/lisp/forms-d2.dat %{_datadir}/emacs/%{version}/lisp/a*.el.gz %{_datadir}/emacs/%{version}/lisp/b*.el.gz %{_datadir}/emacs/%{version}/lisp/c[a-tv]*.el.gz @@ -726,7 +725,6 @@ %{_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/emulation/*.el.gz %{_datadir}/emacs/%{version}/lisp/international/[a-k]*.el.gz %{_datadir}/emacs/%{version}/lisp/international/[o-z]*.el.gz @@ -809,6 +807,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.95 2009/07/31 08:46:49 arekm +- 23.1; files need update + Revision 1.94 2009/07/12 13:14:14 arekm - release 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emacs/emacs-lib64.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emacs/emacs.spec?r1=1.94&r2=1.95&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
