Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at 2012-08-23 15:32:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs (Old) and /work/SRC/openSUSE:Factory/.xemacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xemacs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs/xemacs.changes 2012-06-25 12:47:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xemacs.new/xemacs.changes 2012-08-23 15:32:17.000000000 +0200 @@ -1,0 +2,31 @@ +Tue Aug 14 01:35:35 UTC 2012 - [email protected] + +- fix mis-cleaned stuff by spec-cleaner. + +------------------------------------------------------------------- +Sat Aug 11 19:41:21 UTC 2012 - [email protected] + +- removed patch22 destdir.patch + * too old, no longer works. + * the removal doesn't even affect the final RPM at all. +- update License to GPL-3.0+ + * upstream update its license. +- reopen "export CFLAGS LDFAGS". + * nemui's request miscomment it. because it has values, not empty. +- remove miss-added conditional tags. + * nemui said it's used for pdump = 0, but pdump never got enabled at all. +- re-enable COMP --with-gcc. +- spec-clean +- find a wiser and easier way to solve the OBS dump segmentation error. + * just enable pdump and dump_in_exec by set them to 1. + +------------------------------------------------------------------- +Wed Aug 8 21:01:37 UTC 2012 - [email protected] + +- update to beta version 21.5.32 "habanero". + * see http://www.xemacs.org/Releases/21.5.32.html +- regenerated patch with latest source. +- fix spec file, whose build result will cause a sys fault. + * see https://build.opensuse.org/request/show/129964 for desc. + +------------------------------------------------------------------- Old: ---- destdir.patch xemacs-21.5.31.tar.gz New: ---- xemacs-21.5.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.wQbMLz/_old 2012-08-23 15:32:26.000000000 +0200 +++ /var/tmp/diff_new_pack.wQbMLz/_new 2012-08-23 15:32:26.000000000 +0200 @@ -41,31 +41,25 @@ %else BuildRequires: gpm %endif +Version: 21.5.32 +Release: 0 +Summary: XEmacs +License: GPL-3.0+ +Group: Productivity/Editors/Emacs %define appdefdir /usr/share/X11 %define xbindir /usr/bin %define xincludes /usr/include %define xlibraries /usr/%{_lib} -%define _id b604d235f028 +%define _id 900a0a8796c3 %define _hg beta-%{_id} Url: http://www.xemacs.org -PreReq: permissions -Requires: ctags -Requires: xemacs-info -Requires: xemacs-packages -Conflicts: gnuserv -Version: 21.5.31 -Release: 0 -Summary: XEmacs -License: GPL-2.0+ -Group: Productivity/Editors/Emacs -BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the Mercurial tree of XEmacs: # See: http://xemacs.digimirror.nl/Develop/hgaccess.html # hg clone http://hg.debian.org/hg/xemacs/xemacs-beta # # delete the .hg directory before creating the tarball in order # not to make the source rpm huge. -Source0: http://ftp.freenet.de/pub/ftp.xemacs.org/tux/xemacs/xemacs-21.5/xemacs-21.5.31.tar.gz +Source0: http://ftp.freenet.de/pub/ftp.xemacs.org/tux/xemacs/xemacs-21.5/%{name}-%{version}.tar.gz Source1: xe-list.el Source2: fix-load-history.el Source3: xemacs.desktop @@ -78,7 +72,6 @@ Patch3: xemacs-app-defaults.patch Patch18: xemacs-21.4.8-xevent.patch Patch20: xemacs-21.4.13-ppc64.patch -Patch22: destdir.patch Patch23: xemacs-ptmx.dif Patch27: xemacs-level3.patch Patch28: xemacs-21.5.18-movemail.patch @@ -94,6 +87,12 @@ Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch +Requires(pre): permissions +Requires: ctags +Requires: xemacs-info +Requires: xemacs-packages +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: gnuserv %define _default_patch_fuzz 2 %bcond_with lock @@ -109,10 +108,10 @@ macros. %package -n xemacs-el -Requires: xemacs == %{version}-%{release} -Requires: xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs Group: Productivity/Editors/Emacs +Requires: xemacs = %{version} +Requires: xemacs-packages-el %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -125,9 +124,9 @@ at the Lisp sources. %package -n xemacs-info -Requires: xemacs-packages-info Summary: Info Files for XEmacs Group: Productivity/Editors/Emacs +Requires: xemacs-packages-info %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -141,11 +140,13 @@ # therefore we use XFontSet support: %{!?enable_xfs:%global enable_xfs 1} %ifarch ia64 -%global enable_pdump 0 +# FIXME! I didn't build and test! +# But according to x86_64 and less, we can safely open it in this version +%global enable_pdump 1 %else -%global enable_pdump 0 +%global enable_pdump 1 %endif -%global enable_dump_in_exec 0 +%global enable_dump_in_exec 1 %if ! %enable_xfs echo Use xft, requires X11, Xft, Xrender, freetype, and fontconfig support. %else @@ -155,7 +156,6 @@ %patch3 -p1 %patch18 -p0 -b .xevent %patch20 -p1 -%patch22 -p0 %patch23 -p1 %patch27 -p1 -b .lvl3 %patch28 -p1 -b .movemail @@ -183,7 +183,7 @@ find . | xargs touch -r . # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) -%if %suse_version >= 1110 +%if 0%{?suse_version} >= 1110 %ifarch ppc ppc64 ia64 %if %(getconf PAGESIZE) != 65536 %error "Error: wrong build host, PAGESIZE must be 65536" @@ -242,7 +242,7 @@ MOD=${ARCH}/modules STATE=/var/lib/xemacs MAN=/usr/share/man/man1 - CFLAGS="-Wall ${RPM_OPT_FLAGS} -pipe ${LOOP} -DLDAP_DEPRECATED " + CFLAGS="-Wall %{optflags} -pipe ${LOOP} -DLDAP_DEPRECATED " %ifarch s390x CFLAGS="$CFLAGS -O1" %endif @@ -356,7 +356,7 @@ # --with-xim=xlib, the above comment from './configure --help' # seems to be incorrect in that respect.) # -MULE="--enable-mule \ +MULE="--with-mule \ --with-xim=xlib \ %if %enable_xfs --with-xfs \ @@ -375,18 +375,18 @@ --with-ldflags=\"${LDFLAGS}\" \ " eval ./configure $SYS $COMP $PREFIX $SPECIAL $X11 $MULE $MAIL -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install set +o posix # -mkdir -p %{buildroot}/usr/share/xemacs/site-lisp/lisp -mkdir -p %{buildroot}/usr/share/xemacs/site-packages/lisp/term +mkdir -p %{buildroot}%{_datadir}/xemacs/site-lisp/lisp +mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp/term %if %{with lock} -mkdir -p %{buildroot}/var/lib/xemacs/lock -chmod 1777 %{buildroot}/var/lib/xemacs/lock +mkdir -p %{buildroot}%{_localstatedir}/lib/xemacs/lock +chmod 1777 %{buildroot}%{_localstatedir}/lib/xemacs/lock %endif -make DESTDIR=%{buildroot} install +make install DESTDIR=%{buildroot} mv %{buildroot}%{xbindir}/xemacs-21.?-??? %{buildroot}%{xbindir}/xemacs # fix up the load-history to make it possible to use find-function # on functions which are in dumped lisp files, even if XEmacs was not @@ -399,10 +399,10 @@ # Test whether this works by evaluating (find-function 'next-line) # install -m 644 %{_sourcedir}/fix-load-history.el \ - %{buildroot}/usr/share/xemacs/site-packages/lisp/ -rm -rf %{buildroot}/usr/share/xemacs/%{version}/src/ -rm -rf %{buildroot}/usr/share/xemacs/%{version}/lib-src/ -rm -f %{buildroot}/usr/share/xemacs/%{version}/Installation + %{buildroot}%{_datadir}/xemacs/site-packages/lisp/ +rm -rf %{buildroot}%{_datadir}/xemacs/%{version}/src/ +rm -rf %{buildroot}%{_datadir}/xemacs/%{version}/lib-src/ +rm -f %{buildroot}%{_datadir}/xemacs/%{version}/Installation ###################################################################### test -L %{buildroot}%{xbindir}/xemacs && \ rm %{buildroot}%{xbindir}/xemacs @@ -411,20 +411,20 @@ mv %{buildroot}%{xbindir}/xemacs-${ver%%.*}-b${ver##*.} %{buildroot}%{xbindir}/xemacs chmod 755 %{buildroot}%{xbindir}/xemacs rm -f %{buildroot}%{xbindir}/xemacs-script -rm -rf %{buildroot}/usr/share/xemacs/%{version}/etc/tests -for f in %{buildroot}/usr/man/man1/*.1 \ - %{buildroot}/usr/share/man/man1/*.1 \ - %{buildroot}/usr/share/xemacs/info/*info* \ - %{buildroot}/usr/share/xemacs/%{version}/etc/*.1 \ - %{buildroot}/usr/share/xemacs/%{version}/etc/mule/*.1 +rm -rf %{buildroot}%{_datadir}/xemacs/%{version}/etc/tests +for f in %{buildroot}%{_prefix}/man/man1/*.1 \ + %{buildroot}%{_mandir}/man1/*.1 \ + %{buildroot}%{_datadir}/xemacs/info/*info* \ + %{buildroot}%{_datadir}/xemacs/%{version}/etc/*.1 \ + %{buildroot}%{_datadir}/xemacs/%{version}/etc/mule/*.1 do test "${f##*.}" = "gz" && continue test -e $f || continue gzip -9f $f done -find %{buildroot}/usr/share/xemacs/%{version}/ -name '*.orig' | xargs -r rm -f -find %{buildroot}/usr/share/xemacs/%{version}/ -name '*.el.ediff' | xargs -r rm -f -find %{buildroot}/usr/share/xemacs/%{version}/ -name '*.el.vm' | xargs -r rm -f +find %{buildroot}%{_datadir}/xemacs/%{version}/ -name '*.orig' | xargs -r rm -f +find %{buildroot}%{_datadir}/xemacs/%{version}/ -name '*.el.ediff' | xargs -r rm -f +find %{buildroot}%{_datadir}/xemacs/%{version}/ -name '*.el.vm' | xargs -r rm -f # ctags and etags are part of the ctags package # b2m and rcs-checkin are in the emacs package. # As all binaries are in /usr/bin/ with X11R7, xemacs would conflict @@ -435,16 +435,16 @@ %{buildroot}%{xbindir}/etags \ %{buildroot}%{xbindir}/b2m \ %{buildroot}%{xbindir}/rcs-checkin \ - %{buildroot}/usr/share/man/man1/ctags.1.gz \ - %{buildroot}/usr/share/man/man1/etags.1.gz \ - %{buildroot}/usr/share/xemacs/%{version}/etc/ctags.1.gz \ - %{buildroot}/usr/share/xemacs/%{version}/etc/etags.1.gz + %{buildroot}%{_mandir}/man1/ctags.1.gz \ + %{buildroot}%{_mandir}/man1/etags.1.gz \ + %{buildroot}%{_datadir}/xemacs/%{version}/etc/ctags.1.gz \ + %{buildroot}%{_datadir}/xemacs/%{version}/etc/etags.1.gz # Some .elc's are not needed: -find %{buildroot}/usr/share/xemacs/ -name '_pkg.elc' | xargs -r rm -f -find %{buildroot}/usr/share/xemacs/ -name 'auto-autoloads.el?' | xargs -r rm -f -find %{buildroot}/usr/lib/xemacs/ -name 'auto-autoloads.el?' | xargs -r rm -f -rm -f %{buildroot}/usr/share/xemacs/%{version}/lisp/default.elc -rm -f %{buildroot}/usr/share/xemacs/%{version}/lisp/vm/vm.elc +find %{buildroot}%{_datadir}/xemacs/ -name '_pkg.elc' | xargs -r rm -f +find %{buildroot}%{_datadir}/xemacs/ -name 'auto-autoloads.el?' | xargs -r rm -f +find %{buildroot}%{_prefix}/lib/xemacs/ -name 'auto-autoloads.el?' | xargs -r rm -f +rm -f %{buildroot}%{_datadir}/xemacs/%{version}/lisp/default.elc +rm -f %{buildroot}%{_datadir}/xemacs/%{version}/lisp/vm/vm.elc #if test -e /usr/share/xemacs/%{version}/lisp/xpm-button.el -a \ # -e /usr/share/xemacs/%{version}/lisp/xemacs-base/xpm-button.el #then @@ -452,32 +452,32 @@ # rm -f /usr/share/xemacs/%{version}/lisp/xpm-button.elc #fi # no .origs -rm -f %{buildroot}/usr/share/xemacs/info/xemacs-faq.info.orig* +rm -f %{buildroot}%{_datadir}/xemacs/info/xemacs-faq.info.orig* # # Make TUTORIAL's visible -for t in %{buildroot}/usr/share/xemacs/%{version}/etc/mule/TUTORIAL.* ; do +for t in %{buildroot}%{_datadir}/xemacs/%{version}/etc/mule/TUTORIAL.* ; do test -e $t || break - test -e %{buildroot}/usr/share/xemacs/%{version}/etc/${t##*/} && rm -f $t - test -e $t && mv $t %{buildroot}/usr/share/xemacs/%{version}/etc/${t##*/} + test -e %{buildroot}%{_datadir}/xemacs/%{version}/etc/${t##*/} && rm -f $t + test -e $t && mv $t %{buildroot}%{_datadir}/xemacs/%{version}/etc/${t##*/} done # install the standard app-defaults file used for all languages # which don't have their own app-defaults file above: mkdir -p %{buildroot}%{appdefdir}/app-defaults/ install -m 644 etc/Emacs.ad %{buildroot}%{appdefdir}/app-defaults/XEmacs # SuSE extension -install -m 0644 %{_sourcedir}/site-start.el %{buildroot}/usr/share/xemacs/site-packages/lisp/ -install -m 0644 %{_sourcedir}/suse-xft-init.el %{buildroot}/usr/share/xemacs/site-packages/lisp/ -install -m 0644 site-packages/lisp/term/func-keys.el %{buildroot}/usr/share/xemacs/site-packages/lisp/term/ -install -m 0644 site-packages/lisp/term/linux.el %{buildroot}/usr/share/xemacs/site-packages/lisp/term/ -install -m 0644 site-packages/lisp/term/xterm.el %{buildroot}/usr/share/xemacs/site-packages/lisp/term/ -install -m 0644 site-packages/lisp/term/gnome.el %{buildroot}/usr/share/xemacs/site-packages/lisp/term/ -install -m 0644 site-packages/lisp/term/kvt.el %{buildroot}/usr/share/xemacs/site-packages/lisp/term/ -./src/xemacs -batch -no-site-file -vanilla -f batch-byte-compile %{buildroot}/usr/share/xemacs/site-packages/lisp/term/*.el +install -m 0644 %{_sourcedir}/site-start.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/ +install -m 0644 %{_sourcedir}/suse-xft-init.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/ +install -m 0644 site-packages/lisp/term/func-keys.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/term/ +install -m 0644 site-packages/lisp/term/linux.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/term/ +install -m 0644 site-packages/lisp/term/xterm.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/term/ +install -m 0644 site-packages/lisp/term/gnome.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/term/ +install -m 0644 site-packages/lisp/term/kvt.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/term/ +./src/xemacs -batch -no-site-file -vanilla -f batch-byte-compile %{buildroot}%{_datadir}/xemacs/site-packages/lisp/term/*.el mkdir -p %{buildroot}/%{_docdir}/xemacs install -m 0644 suse/README.SuSE %{buildroot}/%{_docdir}/xemacs/README.SuSE ln -sf /usr/share/xemacs/%{version}/etc %{buildroot}/%{_docdir}/xemacs/etc -mkdir -p %{buildroot}/etc/skel/.xemacs -install -m 0644 %{_sourcedir}/skel.init.el %{buildroot}/etc/skel/.xemacs/init.el +mkdir -p %{buildroot}%{_sysconfdir}/skel/.xemacs +install -m 0644 %{_sourcedir}/skel.init.el %{buildroot}%{_sysconfdir}/skel/.xemacs/init.el fdupes -q -r -1 %{buildroot}%{_datadir}/xemacs/%{version}/etc/ %{buildroot}%{_mandir}/man1/ |\ xargs -n 2 | while read first second; do case "${first}" in @@ -504,7 +504,7 @@ done # # replace buildroot in comments in .elc files by spaces with the same total length: -REPLACEMENT=$(echo "%{buildroot}" | tr '[:print:]' ' ') +REPLACEMENT=$(echo %{buildroot} | tr '[:print:]' ' ') for i in $(find %{buildroot} -name "*.elc") do perl -pi -e "s|(;;; from file )%{buildroot}(/usr/share/xemacs/.*)|\1$REPLACEMENT\2|" $i @@ -519,7 +519,7 @@ ( find %{buildroot} \ \( \( \( -not -type d \) -a \( -not -type l \) \) -printf '%%p\n' \) -o \ \( -type d -printf '%%p/\n' \) -o \( -type l -printf '%%p\n' \) ; \ - find %{buildroot}/usr/share/xemacs/ %{buildroot}/usr/lib/xemacs/ -type f -o -type l ) | \ + find %{buildroot}%{_datadir}/xemacs/ %{buildroot}%{_prefix}/lib/xemacs/ -type f -o -type l ) | \ grep -v "/usr/share/xemacs/%{version}/etc" | \ sort -t /| uniq | perl -p -e "s|%{buildroot}||" > xe-list ./src/xemacs -batch -no-site-file -l %{_sourcedir}/xe-list.el -f xe-list-generate-list-files @@ -531,7 +531,7 @@ ## # do no include header files because RPMLINT complains about header files in non-devel # packages: -rm -rf %{buildroot}/usr/lib/xemacs/%{version}/*-suse-linux/include/ +rm -rf %{buildroot}%{_prefix}/lib/xemacs/%{version}/*-suse-linux/include/ %if %{with lock} %if %{defined verify_permissions} @@ -546,15 +546,12 @@ %endif %endif -%clean -rm -rf %{buildroot} - %files -f xe-list-el-without-elc_xe-list-elc-without-el_xe-list-elc-with-el %defattr(-,root,root) -%dir /etc/skel/.xemacs -%config /etc/skel/.xemacs/init.el -/usr/share/applications/xemacs.desktop -/usr/share/pixmaps/xemacs.png +%dir %{_sysconfdir}/skel/.xemacs +%config %{_sysconfdir}/skel/.xemacs/init.el +%{_datadir}/applications/xemacs.desktop +%{_datadir}/pixmaps/xemacs.png %{xbindir}/ellcc %{xbindir}/gnuattach %{xbindir}/gnuclient @@ -567,71 +564,71 @@ %endif %endif %{appdefdir}/app-defaults/XEmacs -%dir /usr/lib/xemacs -%dir /usr/lib/xemacs/%{version} -%dir /usr/lib/xemacs/%{version}/*-suse-linux/ -/usr/lib/xemacs/%{version}/*-suse-linux/DOC -/usr/lib/xemacs/%{version}/*-suse-linux/add-big-package.sh -/usr/lib/xemacs/%{version}/*-suse-linux/config.values -/usr/lib/xemacs/%{version}/*-suse-linux/cvtmail -/usr/lib/xemacs/%{version}/*-suse-linux/digest-doc -/usr/lib/xemacs/%{version}/*-suse-linux/fakemail -/usr/lib/xemacs/%{version}/*-suse-linux/gnuserv -/usr/lib/xemacs/%{version}/*-suse-linux/gzip-el.sh -/usr/lib/xemacs/%{version}/*-suse-linux/hexl -/usr/lib/xemacs/%{version}/*-suse-linux/make-docfile -/usr/lib/xemacs/%{version}/*-suse-linux/mmencode -%dir /usr/lib/xemacs/%{version}/*-suse-linux/modules/ -/usr/lib/xemacs/%{version}/*-suse-linux/modules/*.ell -/usr/lib/xemacs/%{version}/*-suse-linux/movemail -/usr/lib/xemacs/%{version}/*-suse-linux/profile -/usr/lib/xemacs/%{version}/*-suse-linux/rcs2log -/usr/lib/xemacs/%{version}/*-suse-linux/sorted-doc -/usr/lib/xemacs/%{version}/*-suse-linux/vcdiff -%dir /usr/lib/xemacs/site-modules/ +%dir %{_prefix}/lib/xemacs +%dir %{_prefix}/lib/xemacs/%{version} +%dir %{_prefix}/lib/xemacs/%{version}/*-suse-linux/ +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/DOC +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/add-big-package.sh +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/config.values +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/cvtmail +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/digest-doc +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/fakemail +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/gnuserv +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/gzip-el.sh +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/hexl +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/make-docfile +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/mmencode +%dir %{_prefix}/lib/xemacs/%{version}/*-suse-linux/modules/ +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/modules/*.ell +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/movemail +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/profile +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/rcs2log +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/sorted-doc +%{_prefix}/lib/xemacs/%{version}/*-suse-linux/vcdiff +%dir %{_prefix}/lib/xemacs/site-modules/ %dir %{_docdir}/xemacs/ %doc %{_docdir}/xemacs/README.SuSE %{_docdir}/xemacs/etc -%doc /usr/share/man/man1/gnuattach.1.gz -%doc /usr/share/man/man1/gnuclient.1.gz -%doc /usr/share/man/man1/gnudoit.1.gz -%doc /usr/share/man/man1/gnuserv.1.gz -%doc /usr/share/man/man1/xemacs.1.gz -%dir /usr/share/xemacs/ -%dir /usr/share/xemacs/%{version}/ -%dir /usr/share/xemacs/%{version}/etc/ -/usr/share/xemacs/%{version}/etc/* -%dir /usr/share/xemacs/%{version}/lisp/ -%doc /usr/share/xemacs/%{version}/lisp/ChangeLog* -%doc /usr/share/xemacs/%{version}/lisp/README -%dir /usr/share/xemacs/%{version}/lisp/mule/ -%doc /usr/share/xemacs/%{version}/lisp/mule/mule-locale.txt -%dir /usr/share/xemacs/%{version}/lisp/term -%doc /usr/share/xemacs/%{version}/lisp/term/README -%dir /usr/share/xemacs/site-packages/ -%dir /usr/share/xemacs/site-packages/lisp/ -%dir /usr/share/xemacs/site-packages/lisp/term/ -%dir /usr/share/xemacs/site-lisp/ -%dir /usr/share/xemacs/site-lisp/lisp/ +%doc %{_mandir}/man1/gnuattach.1.gz +%doc %{_mandir}/man1/gnuclient.1.gz +%doc %{_mandir}/man1/gnudoit.1.gz +%doc %{_mandir}/man1/gnuserv.1.gz +%doc %{_mandir}/man1/xemacs.1.gz +%dir %{_datadir}/xemacs/ +%dir %{_datadir}/xemacs/%{version}/ +%dir %{_datadir}/xemacs/%{version}/etc/ +%{_datadir}/xemacs/%{version}/etc/* +%dir %{_datadir}/xemacs/%{version}/lisp/ +%doc %{_datadir}/xemacs/%{version}/lisp/ChangeLog* +%doc %{_datadir}/xemacs/%{version}/lisp/README +%dir %{_datadir}/xemacs/%{version}/lisp/mule/ +%doc %{_datadir}/xemacs/%{version}/lisp/mule/mule-locale.txt +%dir %{_datadir}/xemacs/%{version}/lisp/term +%doc %{_datadir}/xemacs/%{version}/lisp/term/README +%dir %{_datadir}/xemacs/site-packages/ +%dir %{_datadir}/xemacs/site-packages/lisp/ +%dir %{_datadir}/xemacs/site-packages/lisp/term/ +%dir %{_datadir}/xemacs/site-lisp/ +%dir %{_datadir}/xemacs/site-lisp/lisp/ %if %{with lock} -%dir /var/lib/xemacs/ -%dir %verify(not mode group) %attr(1775,root,trusted) /var/lib/xemacs/lock/ +%dir %{_localstatedir}/lib/xemacs/ +%dir %verify(not mode group) %attr(1775,root,trusted) /var/lib/xemacs/lock %endif %files -n xemacs-info %defattr(-,root,root) -%dir /usr/share/xemacs/ -%dir /usr/share/xemacs/info/ -%doc /usr/share/xemacs/info/* +%dir %{_datadir}/xemacs/ +%dir %{_datadir}/xemacs/info/ +%doc %{_datadir}/xemacs/info/* %files -n xemacs-el -f xe-list-el-with-elc %defattr(-,root,root) -%dir /usr/share/xemacs/ -%dir /usr/share/xemacs/%{version}/lisp/ -%dir /usr/share/xemacs/%{version}/lisp/mule/ -%dir /usr/share/xemacs/%{version}/lisp/term/ -%dir /usr/share/xemacs/site-packages/ -%dir /usr/share/xemacs/site-packages/lisp/ -%dir /usr/share/xemacs/site-packages/lisp/term/ +%dir %{_datadir}/xemacs/ +%dir %{_datadir}/xemacs/%{version}/lisp/ +%dir %{_datadir}/xemacs/%{version}/lisp/mule/ +%dir %{_datadir}/xemacs/%{version}/lisp/term/ +%dir %{_datadir}/xemacs/site-packages/ +%dir %{_datadir}/xemacs/site-packages/lisp/ +%dir %{_datadir}/xemacs/site-packages/lisp/term/ %changelog ++++++ bugzilla-301352-fix-wrong-incrementing-in-macros.patch ++++++ --- /var/tmp/diff_new_pack.wQbMLz/_old 2012-08-23 15:32:26.000000000 +0200 +++ /var/tmp/diff_new_pack.wQbMLz/_new 2012-08-23 15:32:26.000000000 +0200 @@ -6,8 +6,8 @@ Lisp_Object map, content, attrib, value; int point, size, fin_ic; -- j = XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps. */ -+ j = XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps. */ +- j = XCHAR_OR_FIXNUM (ccl_prog[ic++]); /* number of maps. */ ++ j = XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; /* number of maps. */ fin_ic = ic + j; op = reg[rrr]; if ((j > reg[RRR]) && (j >= 0)) @@ -15,8 +15,8 @@ for (;i < j;i++) { size = XVECTOR (Vcode_conversion_map_vector)->size; -- point = XCHAR_OR_INT (ccl_prog[ic++]); -+ point = XCHAR_OR_INT (ccl_prog[ic]); ic++; +- point = XCHAR_OR_FIXNUM (ccl_prog[ic++]); ++ point = XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; if (point >= size) continue; map = XVECTOR (Vcode_conversion_map_vector)->contents[point]; @@ -24,8 +24,8 @@ stack_idx_of_map_multiple = 0; map_set_rest_length = -- XCHAR_OR_INT (ccl_prog[ic++]); /* number of maps and separators. */ -+ XCHAR_OR_INT (ccl_prog[ic]); ic++; /* number of maps and separators. */ +- XCHAR_OR_FIXNUM (ccl_prog[ic++]); /* number of maps and separators. */ ++ XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; /* number of maps and separators. */ fin_ic = ic + map_set_rest_length; op = reg[rrr]; @@ -33,8 +33,8 @@ { Lisp_Object map, attrib, value, content; int size, point; -- j = XCHAR_OR_INT (ccl_prog[ic++]); /* map_id */ -+ j = XCHAR_OR_INT (ccl_prog[ic]); ic++; /* map_id */ +- j = XCHAR_OR_FIXNUM (ccl_prog[ic++]); /* map_id */ ++ j = XCHAR_OR_FIXNUM (ccl_prog[ic]); ic++; /* map_id */ op = reg[rrr]; if (j >= XVECTOR (Vcode_conversion_map_vector)->size) { ++++++ xemacs-21.4.8-xevent.patch ++++++ --- /var/tmp/diff_new_pack.wQbMLz/_old 2012-08-23 15:32:26.000000000 +0200 +++ /var/tmp/diff_new_pack.wQbMLz/_new 2012-08-23 15:32:26.000000000 +0200 @@ -2,20 +2,17 @@ =================================================================== --- src/event-Xt.c.orig +++ src/event-Xt.c -@@ -1224,9 +1224,13 @@ x_event_to_emacs_event (XEvent *x_event, +@@ -1224,8 +1224,11 @@ x_event_to_emacs_event (XEvent *x_event, if (modifiers & XEMACS_MOD_SHIFT) { - int Mode_switch_p = *state & xd->ModeMask; - KeySym bot = XLookupKeysym (ev, Mode_switch_p ? 2 : 0); -- KeySym top = XLookupKeysym (ev, Mode_switch_p ? 3 : 1); -+ KeySym top, bot; ++ KeySym bot; + XKeyEvent tmpev = *ev; + + tmpev.state = *state & (xd->ModeMask | ~0xff); + XLookupString(&tmpev, NULL, 0, &bot, NULL); -+ tmpev.state |= ShiftMask; -+ XLookupString(&tmpev, NULL, 0, &top, NULL); - if (top && bot && top != bot) - modifiers &= ~XEMACS_MOD_SHIFT; - } + if (x_keysym && bot && x_keysym != bot) + modifiers &= ~XEMACS_MOD_SHIFT; + } ++++++ xemacs-21.5.31.tar.gz -> xemacs-21.5.32.tar.gz ++++++ /work/SRC/openSUSE:Factory/xemacs/xemacs-21.5.31.tar.gz /work/SRC/openSUSE:Factory/.xemacs.new/xemacs-21.5.32.tar.gz differ: char 5, line 1 ++++++ xemacs-level3.patch ++++++ --- /var/tmp/diff_new_pack.wQbMLz/_old 2012-08-23 15:32:26.000000000 +0200 +++ /var/tmp/diff_new_pack.wQbMLz/_new 2012-08-23 15:32:26.000000000 +0200 @@ -23,9 +23,9 @@ return 0; } @@ -872,8 +881,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve - than passing in 0) to avoid crashes on German IRIX */ char dummy[256]; XLookupString (event, dummy, 200, &keysym, 0); + *x_keysym_out = keysym; - return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) - ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); + return (IsModifierKey (keysym) @@ -43,9 +43,9 @@ #endif /* ! XIM_MOTIF */ @@ -932,8 +950,17 @@ x_to_emacs_keysym (XKeyPressedEvent *eve - { case XLookupKeySym: case XLookupBoth: + *x_keysym_out = keysym; - return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) - ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); + return (IsModifierKey (keysym) ++++++ xemacs.patch ++++++ --- /var/tmp/diff_new_pack.wQbMLz/_old 2012-08-23 15:32:26.000000000 +0200 +++ /var/tmp/diff_new_pack.wQbMLz/_new 2012-08-23 15:32:26.000000000 +0200 @@ -268,18 +268,18 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/x-win-xfree86.el +++ xemacs-21.5.29/lisp/x-win-xfree86.el -@@ -101,6 +101,10 @@ +@@ -99,6 +99,11 @@ ;; define also the control, meta, and meta-control versions. (loop for mods in '(() (control) (meta) (meta control)) do - (define-key function-key-map `[(,@mods ,key)] `[(shift ,@mods ,sane-key)]) -- )))) -- -+ ))) + (define-key function-key-map `[(,@mods ,key)] +- `[(shift ,@mods ,sane-key)]))))) ++ `[(shift ,@mods ,sane-key)])))) +;; Begin insert +;; <[email protected]> set Symbol delete == [delete] to delete-char + (load "term/func-keys" t t) +;; End insert +) + ;;; x-win-xfree86.el ends here Index: xemacs-21.5.29/site-packages/lisp/term/func-keys.el =================================================================== -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
