Hello community, here is the log from the commit of package emacs checked in at Sun Aug 6 21:34:56 CEST 2006. -------- --- emacs/emacs.changes 2006-08-02 20:17:45.000000000 +0200 +++ emacs/emacs.changes 2006-08-03 16:02:41.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 3 16:01:30 CEST 2006 - werner@suse.de + +- Make last change depending on X11 release version +- Do not use not initialized variables + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.z4cOSy/_old 2006-08-06 21:34:35.000000000 +0200 +++ /var/tmp/diff_new_pack.z4cOSy/_new 2006-08-06 21:34:35.000000000 +0200 @@ -20,7 +20,7 @@ Provides: ge_site ge_exec Autoreqprov: on Version: 21.3 -Release: 227 +Release: 228 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: GNU Emacs Base Package Source: emacs-21.3.tar.bz2 @@ -28,7 +28,6 @@ Source2: app-defaults.Emacs Source3: site-lisp.tar.bz2 Source4: dot.gnu-emacs -%define appDefaultsFile /usr/share/X11/app-defaults/Emacs Patch: emacs-21.3.dif Patch1: emacs-21.1-linkscr.patch Patch2: emacs-21.1-ppc.patch @@ -49,6 +48,12 @@ Patch18: emacs-21.3-movemail.patch Patch19: emacs-21.3-sentinel.patch Patch20: emacs-21.3-xim.patch +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" +%define appDefaultsFile %{_exec_prefix}/lib/X11/app-defaults/Emacs +%else +%define appDefaultsFile %{_datadir}/X11/app-defaults/Emacs +%endif %description Basic package for the GNU Emacs editor. Requires emacs-x11 or @@ -251,7 +256,7 @@ for i in `find site-lisp/ -name '*.el'`; do src/emacs -batch -q --no-site -f batch-byte-compile $i; \ done -rm -f src/emacs src/emacs-${VERSION}* +rm -f src/emacs src/emacs-%{version}* make cp src/emacs emacs-nox make distclean @@ -273,19 +278,19 @@ set +o posix touch /tmp/bstamp; sleep 3; sync ## -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} VERSION=%{version} -mkdir -p $RPM_BUILD_ROOT/usr/bin -install -m755 emacs-nox $RPM_BUILD_ROOT/usr/bin/ -make install %(echo %PREFIX | sed -e s/--//g -e s/-/_/g -e "s,=,=\$RPM_BUILD_ROOT,g") -mkdir -p $RPM_BUILD_ROOT/var/lib/emacs/lock -chmod 1777 $RPM_BUILD_ROOT/var/lib/emacs/lock +mkdir -p %{buildroot}/usr/bin +install -m755 emacs-nox %{buildroot}/usr/bin/ +make install %(echo %PREFIX | sed -e s/--//g -e s/-/_/g -e "s,=,=\%{buildroot},g") +mkdir -p %{buildroot}/var/lib/emacs/lock +chmod 1777 %{buildroot}/var/lib/emacs/lock tar cf - `find site-lisp/ -name '*.el' -o -name '*.elc'` | \ -tar -x -f - -C $RPM_BUILD_ROOT/usr/share/emacs/${VERSION}/ -mkdir -p $RPM_BUILD_ROOT%{_docdir}/emacs -ln -sf /usr/share/emacs/${VERSION}/etc $RPM_BUILD_ROOT%{_docdir}/emacs/doc -find $RPM_BUILD_ROOT/usr/share/emacs/${VERSION}/ -name '*,v' -o -name '*.orig' | xargs -r rm -f -for f in $RPM_BUILD_ROOT/usr/share/info/* ; do +tar -x -f - -C %{buildroot}/usr/share/emacs/%{version}/ +mkdir -p %{buildroot}%{_docdir}/emacs +ln -sf /usr/share/emacs/%{version}/etc %{buildroot}%{_docdir}/emacs/doc +find %{buildroot}/usr/share/emacs/%{version}/ -name '*,v' -o -name '*.orig' | xargs -r rm -f +for f in %{buildroot}/usr/share/info/* ; do case "$f" in *.gz) ;; */dir) rm -f ${f} ;; @@ -294,15 +299,15 @@ esac done # -mkdir -p $RPM_BUILD_ROOT%(dirname %{appDefaultsFile}) -cp -p %{S:2} $RPM_BUILD_ROOT%{appDefaultsFile} +mkdir -p %{buildroot}%(dirname %{appDefaultsFile}) +cp -p %{S:2} %{buildroot}%{appDefaultsFile} pushd ../ -mkdir -p $RPM_BUILD_ROOT/etc/skel -install -m 0444 %{S:4} $RPM_BUILD_ROOT/etc/skel/.gnu-emacs -tar cf - site-lisp/ | tar xvvf - -C $RPM_BUILD_ROOT/usr/share/emacs/ -chmod -R a+r $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ +mkdir -p %{buildroot}/etc/skel +install -m 0444 %{S:4} %{buildroot}/etc/skel/.gnu-emacs +tar cf - site-lisp/ | tar xvvf - -C %{buildroot}/usr/share/emacs/ +chmod -R a+r %{buildroot}/usr/share/emacs/site-lisp/ popd -(cd $RPM_BUILD_ROOT +(cd %{buildroot} find usr/share/emacs/site-lisp/ -type f \ \( -name site-start.el -printf "%%%%config " , \ -printf "/%%p\n" \) @@ -315,7 +320,7 @@ ## Compare them with the rpm listings. ## touch /tmp/estamp; sleep 3; sync -( cd $RPM_BUILD_ROOT +( cd %{buildroot} find . -xdev \( -newer /tmp/bstamp -a \( -not -newer /tmp/estamp \) \) -a \( \ \( \( \( -not -type d \) -a \( -not -type l \) \) -printf '/%%P\n' \) -o \ \( -type d -printf '/%%P/\n' \) -o \( -type l -printf '/%%P\n' \) \) ; \ @@ -324,21 +329,21 @@ rm /tmp/estamp /tmp/bstamp ## # cleanup -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/bindings.elc -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/dired.el.dired -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/elc.tar.gz -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/loaddefs.el.psbdf -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/ps-bdf.el.psbdf -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/ps-mule.el.print -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/ps-mule.el.mule -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/textmodes/ispell.el.mule -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/site-load.elc -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/skeleton.elc -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/term.el.term -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/etc/ctags.1 -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/etc/etags.1 -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/elc.tar.gz -rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp/paths.el.sendmail +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/bindings.elc +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/dired.el.dired +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/elc.tar.gz +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/loaddefs.el.psbdf +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/ps-bdf.el.psbdf +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/ps-mule.el.print +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/ps-mule.el.mule +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/textmodes/ispell.el.mule +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/site-load.elc +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/skeleton.elc +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/term.el.term +rm -f %{buildroot}/usr/share/emacs/%{version}/etc/ctags.1 +rm -f %{buildroot}/usr/share/emacs/%{version}/etc/etags.1 +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/elc.tar.gz +rm -f %{buildroot}/usr/share/emacs/%{version}/lisp/paths.el.sendmail ## # install desktop file %suse_update_desktop_file -i emacs TextEditor @@ -2385,6 +2390,9 @@ /usr/share/emacs/%{version}/lisp/xt-mouse.el %changelog -n emacs +* Thu Aug 03 2006 - werner@suse.de +- Make last change depending on X11 release version +- Do not use not initialized variables * Wed Aug 02 2006 - aj@suse.de - Fix app-defaults path for X11 R7. * Fri Jun 30 2006 - werner@suse.de ++++++ emacs-21.3-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.z4cOSy/_old 2006-08-06 21:34:36.000000000 +0200 +++ /var/tmp/diff_new_pack.z4cOSy/_new 2006-08-06 21:34:36.000000000 +0200 @@ -4,7 +4,7 @@ xaw_create_scrollbar (instance) widget_instance *instance; { -+ Widget scrollbar; ++ Widget scrollbar = (Widget)0; #if 0 Arg av[20]; int ac = 0; @@ -43,3 +43,27 @@ } DEFUN ("scan-lists", Fscan_lists, Sscan_lists, 3, 3, 0, +--- src/xmenu.c ++++ src/xmenu.c +@@ -695,8 +695,8 @@ + Lisp_Object keymap, tem; + int xpos = 0, ypos = 0; + Lisp_Object title; +- char *error_name; +- Lisp_Object selection; ++ char *error_name = (char*)0; ++ Lisp_Object selection = (Lisp_Object)0; + struct frame *f = NULL; + Lisp_Object x, y, window; + int keymaps = 0; +@@ -972,8 +972,8 @@ + #else + { + Lisp_Object title; +- char *error_name; +- Lisp_Object selection; ++ char *error_name = (char*)0; ++ Lisp_Object selection = (Lisp_Object)0; + + /* Decode the dialog items from what was specified. */ + title = Fcar (contents); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...