commit emacs-w3

31 May 2007

Hello community,

here is the log from the commit of package emacs-w3
checked in at Thu May 31 20:49:39 CEST 2007.

--------

--- emacs-w3/emacs-w3.changes	2006-09-19 19:26:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs-w3/emacs-w3.changes	2007-05-30 11:53:35.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 30 11:46:53 CEST 2007 - schwab@suse.de
+
+- The url package is now part of emacs.
+- Fix spurious executable bits.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ emacs-w3-cvs.spec ++++++
--- /var/tmp/diff_new_pack.L21630/_old	2007-05-31 20:48:58.000000000 +0200
+++ /var/tmp/diff_new_pack.L21630/_new	2007-05-31 20:48:58.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package emacs-w3 (Version cvs)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,17 +11,17 @@
 # norootforbuild
 
 Name:           emacs-w3
-BuildRequires:  emacs-nox emacs-url
+BuildRequires:  emacs-nox
 %define short_name w3
-License:        Other License(s), see package
+License:        GNU General Public License (GPL)
 Group:          Productivity/Editors/Emacs
 Provides:       w3 emacs_w3
 Obsoletes:      emacs_w3
-Requires:       emacs emacs-url
+Requires:       emacs
 Autoreqprov:    on
 Summary:        Emacs/W3--a WWW Browser for Emacs
 Version:        cvs
-Release:        590
+Release:        637
 # Original source: ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/w3-4.0pre.46.tar.gz
 #+ Source: ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/w3-%{version}.tar.bz2
 # CVS: :pserver:anoncvs@subversions.gnu.org:/cvs
@@ -94,9 +94,7 @@
   '(princ (format "%s.%s" emacs-major-version emacs-minor-version)))')
 ./configure --prefix=%{_prefix} --infodir=%{_infodir} \
             --with-lispdir=%{_prefix}/share/emacs/site-lisp/%{short_name} \
-            --datadir=%{_prefix}/share/emacs/%{short_name} \
-            --with-gnus=%{_prefix}/share/emacs/$EMACS_VERSION/lisp/gnus \
-            --with-url=%{_prefix}/share/emacs/site-lisp/url
+            --datadir=%{_prefix}/share/emacs/%{short_name}
 rm -f lisp/*elc
 make
 
@@ -127,7 +125,10 @@
 %{_infodir}/%{short_name}*
 %{_prefix}/share/emacs/%{short_name}
 
-%changelog -n emacs-w3
+%changelog
+* Wed May 30 2007 - schwab@suse.de
+- The url package is now part of emacs.
+- Fix spurious executable bits.
 * Tue Sep 19 2006 - schwab@suse.de
 - Handle new url-retrieve callback interface in Emacs 22.
 * Wed Jan 25 2006 - mls@suse.de

++++++ emacs_w3.dif ++++++
--- /var/tmp/diff_new_pack.L21630/_old	2007-05-31 20:48:58.000000000 +0200
+++ /var/tmp/diff_new_pack.L21630/_new	2007-05-31 20:48:58.000000000 +0200
@@ -1,8 +1,60 @@
---- w3-4.0pre.44/dot.emacs   Thu Mar  5 00:46:33 1998
-+++ w3-4.0pre.44/dot.emacs      Tue Jul 14 13:15:56 1998
+--- w3/dot.emacs
++++ w3/dot.emacs
 @@ -0,0 +1,5 @@
 +
 +;;; Emacs/W3 Configuration
-+(setq load-path (cons "/usr/share/emacs/site-lisp/w3" load-path))
-+(require 'w3-auto "w3-auto")
++(add-to-list 'load-path "/usr/share/emacs/site-lisp/w3")
++(require 'w3-auto)
 +
+--- w3/etc/Makefile.in
++++ w3/etc/Makefile.in
+@@ -5,6 +5,7 @@
+ 
+ EMACS     = @EMACS@
+ INSTALL   = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
+ RM        = rm -f
+ 
+ TARGETS = default.css
+@@ -15,9 +16,9 @@
+ 	( if [ ! -d $(datadir) ]; then mkdir -p $(datadir); fi )
+ 	for x in $(TARGETS); do					\
+ 		if [ -f $$x ]; then				\
+-			$(INSTALL) $$x $(datadir);		\
++			$(INSTALL_DATA) $$x $(datadir);		\
+ 		else						\
+-			$(INSTALL) $(srcdir)/$$x $(datadir);	\
++			$(INSTALL_DATA) $(srcdir)/$$x $(datadir);	\
+ 		fi						\
+ 	done
+ 
+--- w3/lisp/Makefile.in
++++ w3/lisp/Makefile.in
+@@ -17,7 +17,7 @@
+ INSTALL   = @INSTALL@
+ RM        = rm -f
+ 
+-DEPS = -l $(srcdir)/docomp.el -l $(URLDIR)/url-vars.el -l $(srcdir)/w3-vars.el
++DEPS = -l $(srcdir)/docomp.el -l url-vars -l $(srcdir)/w3-vars.el
+ 
+ # compile with noninteractive and relatively clean environment
+ BATCHFLAGS = -batch -q -no-site-file
+--- w3/texi/Makefile.in
++++ w3/texi/Makefile.in
+@@ -6,6 +6,7 @@
+ VPATH     = $(srcdir)
+ EMACS     = @EMACS@
+ INSTALL   = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
+ RM        = rm -f
+ MAKEINFO  = @MAKEINFO@
+ TEXI2HTML = @TEXI2HTML@
+@@ -40,7 +41,7 @@
+ 
+ install:
+ 	( if [ ! -d $(infodir) ]; then mkdir -p $(infodir); fi )
+-	for x in *.info*; do $(INSTALL) $$x $(infodir); done
++	for x in *.info*; do $(INSTALL_DATA) $$x $(infodir); done
+ 	-for x in *.info; do $(INSTALLINFO) $$x $(infodir)/dir; done
+ 
+ distclean: clean


++++++ suse-start-w3.el ++++++
--- emacs-w3/suse-start-w3.el	2003-02-18 20:14:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs-w3/suse-start-w3.el	2007-05-30 11:53:18.000000000 +0200
@@ -1,7 +1,7 @@
 ;; /usr/share/emacs/site-lisp/suse-start-w3.el
 
 (add-to-list 'load-path "/usr/share/emacs/site-lisp/w3")
-(require 'w3-auto "w3-auto")
+(require 'w3-auto)
 
 ;; /usr/share/emacs/site-lisp/suse-start-w3.el ends here
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)