[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/xemacs-packages-extra/devel xemacs-packages-extra-20070427-browsers.patch, NONE, 1.1 xemacs-packages-extra-20070427-jp-locale-239394.patch, NONE, 1.1 xemacs-packages-extra-20070427-rpmspec.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xemacs-packages-extra.spec, 1.3, 1.4 xemacs-packages-extra-20061221-browsers.patch, 1.1, NONE



Author: scop

Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16631

Modified Files:
	.cvsignore sources xemacs-packages-extra.spec 
Added Files:
	xemacs-packages-extra-20070427-browsers.patch 
	xemacs-packages-extra-20070427-jp-locale-239394.patch 
	xemacs-packages-extra-20070427-rpmspec.patch 
Removed Files:
	xemacs-packages-extra-20061221-browsers.patch 
Log Message:
* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 20070427-1
- 2007-04-27 + upstream post-sumo rpm-spec-mode and locale (#239394) fixes.
- Improve Japanese splash screen (#239394, Jens Petersen).
- Require an actual XEmacs editor, not just -common.


xemacs-packages-extra-20070427-browsers.patch:

--- NEW FILE xemacs-packages-extra-20070427-browsers.patch ---
diff -up xemacs-packages-extra-20070427/xemacs-packages/psgml/psgml-html.el~ xemacs-packages-extra-20070427/xemacs-packages/psgml/psgml-html.el
--- xemacs-packages-extra-20070427/xemacs-packages/psgml/psgml-html.el~	2003-08-29 11:19:58.000000000 +0300
+++ xemacs-packages-extra-20070427/xemacs-packages/psgml/psgml-html.el	2007-05-18 10:53:26.000000000 +0300
@@ -931,27 +931,27 @@ get those characters to appear literally
 
 (defvar sgml-html-menu
   (cons "HTML"
-	(append '(["View in Netscape" sgml-html-netscape-file
-		   (buffer-file-name
-		    (current-buffer))]
-		  ["View in W3" w3-preview-this-buffer t]
-		  ["View in kfm" sgml-html-kfm-file
+	(append '(["View in default browser" browse-url-of-buffer t]
+		  ["View in Firefox" sgml-html-netscape-file
+		   (buffer-file-name (current-buffer))]
+		  ["View in Konqueror" sgml-html-kfm-file
 		   (buffer-file-name (current-buffer))]
+		  ["View in W3" w3-preview-this-buffer t]
 		  "---"
 		  ["HTML-Quote Region" html-quote-region t]
 		  "---")
 		(cdr sgml-main-menu))))
 
 (defun sgml-html-netscape-file ()
-  "Preview the file for the current buffer in Netscape."
+  "Preview the file for the current buffer in Firefox."
   (interactive)
-  (highlight-headers-follow-url-netscape
+  (browse-url-firefox
    (concat "file:" (buffer-file-name (current-buffer)))))
 
 (defun sgml-html-kfm-file ()
-  "Preview the file for the current buffer in kfm."
+  "Preview the file for the current buffer in Konqueror."
   (interactive)
-  (highlight-headers-follow-url-kfm
+  (browse-url-kde
    (concat "file:" (buffer-file-name (current-buffer)))))
 
 ;;;###autoload(add-to-list 'auto-mode-alist '("\\.[sj]?html?\\'" . html-mode))

xemacs-packages-extra-20070427-jp-locale-239394.patch:

--- NEW FILE xemacs-packages-extra-20070427-jp-locale-239394.patch ---
Index: mule-packages/locale/start-files/ja/locale-start.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/locale/start-files/ja/locale-start.el,v
retrieving revision 1.4
diff -u -r1.4 locale-start.el
--- mule-packages/locale/start-files/ja/locale-start.el	7 Dec 2004 01:58:44 -0000	1.4
+++ mule-packages/locale/start-files/ja/locale-start.el	18 May 2007 10:24:23 -0000
@@ -84,24 +84,24 @@
 (defun splash-screen-window-body ()
   `(
      (face (blue bold underline)
-	   "#### Entries utiles dans le menu Aide:\n\n")
+	   "$BJXMx$J%X%k%W%a%K%e!<9`L\(B:\n\n")
      ,@(if (string-match "beta" emacs-version)
 	   `((face bold "Beta Info:")
 	     (face (red bold)
-		   "                      Ceci est une version exp,Ai(Brimentale d'XEmacs.\n"))
+		   "                      $B$3$l$O(BXEmacs$B$N%Y!<%?HG$G$9(B.\n"))
 	 `( ""))
      (face bold "XEmacs FAQ:")
-     "                     Lisez la FAQ d'XEmacs.\n"
+     "                     XEmacs$B$N(BFAQ$B$rFI$`(B.\n"
      (face bold "Info (Online Docs):")
-     "             $B$K$h$j!"(BInfo $B%b!<%I$KF~$j!"%*%s%i%$%s$N%I%-%e%a%s%H$r(B.\n"
+     "                         $B%*%s%i%$%s$N%I%-%e%a%s%H$rFI$`(B.\n"
      (face bold "Tutorial:")
-     "                       Lisez le tutoriel d'XEmacs.\n"
-     (face bold "Samples->View Sample init.el:") ;; #### translation
-     "   Un fichier utile d'initialization.\n"
+     "                     XEmacs$B$N%A%e!<%H%j%"%k$rFI$`(B.\n"
+     (face bold "Samples->View Sample init.el:")
+     "                         $B _Dj%U%!%$%k$NNc(B.\n"
      (face bold "About XEmacs:")
-     "                   ,A (B propos des d,Ai(Bveloppeurs d'XEmacs.\n"
+     "                     XEmacs$B$N3+H/<T(B.\n"
      "\n"
-     (face (bold blue) "Site web d'XEmacs:")
+     (face (bold blue) "XEmacs$B$N%&%'%V%5%$%H(B:")
      "                 http://www.xemacs.org/\n\n";
      ,@(if (featurep 'sparcworks)
 	   `( "\
@@ -117,36 +117,36 @@
      (face italic "\
 Copyright (C) 1985-1999 Free Software Foundation, Inc.
 Copyright (C) 1990-1994 Lucid, Inc.
-Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r,Ai(Bserv,Ai(Bs.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
 Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
 Copyright (C) 1995-2004 Ben Wing.\n")
      ))
 
 (defun splash-screen-tty-body ()
   `(
-    (face italic "[`C-' signifie la touche Contr,At(Ble,`M-' signifie la touche M,Ai(Bta]\n\n")
+    (face italic "[`C-' $B$O(B Control$B%-!<(B,`M-' $B$O!!(BMeta$B%-!<(B]\n\n")
      ,@(if (string-match "beta" emacs-version)
 	   `((key describe-beta)
 	     ": " (face (red bold)
-			"Ceci est une version exp,Ai(Brimentale d'XEmacs.\n"))
+			"$B$3$l$O(BXEmacs$B$N%Y!<%?HG$G$9(B.\n"))
 	 `( "\n"))
      (face (bold red) ( "\
 $BIQHK$K?R$M$i$l$k<ALd$H$=$NEz$($O!"(BXEmacs $BLdEz=8$K$"$j$^$9!#(B\n"
 			"$B%X%k%W%a%K%e!<$r;HMQ$9$k$+!"(B"(key xemacs-local-faq) " $B$H%?%$%W$7$F$/$ $5$$!#(B"))
      ((key info) " $B$K$h$j!"(BInfo $B%b!<%I$KF~$j!"%*%s%i%$%s$N%I%-%e%a%s%H$r(B\n")
      ((key help-command)
-      ": De l'aide sur l'utilisation d'XEmacs.\n")
+      ": XEmacs$B$N%X%k%W(B.\n")
      ((key help-with-tutorial)
       " $B$G(B XEmacs $B$N;HMQJ}K!$N<B=,$r3+;O$G$-$^$9!#(B\n")
-     ((key view-sample-init-el) ;; #### translation?
-      ": Regardez le fichier sample init.el.\n")
-     ((key about-xemacs) ": ,A (B propos des d,Ai(Bveloppeurs d'XEmacs.\n\n")
-     (face (bold blue) "Site web d'XEmacs: ") 
+     ((key view-sample-init-el)
+      ": $B _Dj%U%!%$%k$NNc(B.\n")
+     ((key about-xemacs) ": XEmacs$B$N3+H/<T(B.\n\n")
+     (face (bold blue) "XEmacs$B$N%&%'%V%5%$%H(B: ") 
      "http://www.xemacs.org/\n\n";
      (face italic "\
 Copyright (C) 1985-1999 Free Software Foundation, Inc.
 Copyright (C) 1990-1994 Lucid, Inc.
-Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r,Ai(Bserv,Ai(Bs.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
 Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
 Copyright (C) 1995-2004 Ben Wing.")
 ;      ((key find-file) ": visiter un fichier\n")
@@ -160,7 +160,7 @@
   "Print the XEmacs usage message and exit."
   (let ((charmap (shell-command-to-string "locale charmap")))
     (cond ((string-match "UTF-8" charmap)
-	   (require 'un-define)
+	   (or (emacs-version>= 21 5) (require 'un-define))
 	   (set-terminal-coding-system 'utf-8))
 	  ((string-match "EUC-JP" charmap)
 	   (set-terminal-coding-system 'euc-jp))

xemacs-packages-extra-20070427-rpmspec.patch:

--- NEW FILE xemacs-packages-extra-20070427-rpmspec.patch ---
Index: xemacs-packages/prog-modes/rpm-spec-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el,v
retrieving revision 1.17
retrieving revision 1.23
diff -u -r1.17 -r1.23
--- xemacs-packages/prog-modes/rpm-spec-mode.el	9 Jul 2005 10:12:49 -0000	1.17
+++ xemacs-packages/prog-modes/rpm-spec-mode.el	8 May 2007 22:40:58 -0000	1.23
@@ -4,7 +4,7 @@
 
 ;; Author:   Stig Bjørlykke, <stigb tihlde org>
 ;; Keywords: unix, languages, rpm
-;; Version:  0.12
+;; Version:  0.12x
 
 ;; This file is part of XEmacs.
 
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301 USA.
 
 ;;; Synched up with: not in GNU Emacs.
 
@@ -39,7 +39,7 @@
 
 ;; - rewrite function names.
 ;; - autofill changelog entries.
-;; - customize rpm-tags-list and rpm-group-tags-list.
+;; - customize rpm-tags-list, rpm-obsolete-tags-list and rpm-group-tags-list.
 ;; - get values from `rpm --showrc'.
 ;; - ssh/rsh for compile.
 ;; - finish integrating the new navigation functions in with existing stuff.
@@ -63,7 +63,7 @@
 
 ;;; Code:
 
-(defconst rpm-spec-mode-version "0.12" "Version of `rpm-spec-mode'.")
+(defconst rpm-spec-mode-version "0.12x" "Version of `rpm-spec-mode'.")
 
 (defgroup rpm-spec nil
   "RPM spec mode with Emacs/XEmacs enhancements."
@@ -244,18 +244,19 @@
   "Partial list of section names.")
 (defconst rpm-scripts
   '("pre" "post" "preun" "postun"
-    "trigger" "triggerin" "triggerun" "triggerpostun")
+    "trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
+    "pretrans" "posttrans")
   "List of rpm scripts.")
 (defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
 (defconst rpm-section-regexp
   (eval-when-compile
     (concat "^%"
             (regexp-opt
-             ;; From RPM 4.4.1 sources, file build/parseSpec.c: partList[].
+             ;; From RPM 4.4.9 sources, file build/parseSpec.c: partList[].
              '("build" "changelog" "check" "clean" "description" "files"
                "install" "package" "post" "postun" "pretrans" "posttrans"
                "pre" "prep" "preun" "trigger" "triggerin" "triggerpostun"
-               "triggerun" "verifyscript") t)
+               "triggerprein" "triggerun" "verifyscript") t)
             "\\b"))
   "Regular expression to match beginning of a section.")
 
@@ -267,6 +268,11 @@
   "*Face for tags."
   :group 'rpm-spec-faces)
 
+(defface rpm-spec-obsolete-tag-face
+  '(( ((class color)) (:foreground "white" :background "red") ))
+  "*Face for obsolete tags."
+  :group 'rpm-spec-faces)
+
 (defface rpm-spec-macro-face
   '(( ((class color) (background light)) (:foreground "purple") )
     ( ((class color) (background dark)) (:foreground "yellow") ))
@@ -316,6 +322,8 @@
   'rpm-spec-var-face "*Face for environment variables.")
 (defvar rpm-spec-tag-face
   'rpm-spec-tag-face "*Face for tags.")
+(defvar rpm-spec-obsolete-tag-face
+  'rpm-spec-tag-face "*Face for obsolete tags.")
 (defvar rpm-spec-package-face
   'rpm-spec-package-face "*Face for package tag.")
 (defvar rpm-spec-dir-face
@@ -340,7 +348,7 @@
 (defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
 
 (defvar rpm-tags-list
-  ;; From RPM 4.4.1 sources, file build/parsePreamble.c: preambleList[], and
+  ;; From RPM 4.4.9 sources, file build/parsePreamble.c: preambleList[], and
   ;; a few macros that aren't tags, but useful here.
   '(("AutoProv")
     ("AutoReq")
@@ -348,16 +356,20 @@
     ("BuildArch")
     ("BuildArchitectures")
     ("BuildConflicts")
+    ("BuildEnhances")
+    ("BuildPlatforms")
     ("BuildPreReq")
     ("BuildRequires")
     ("BuildRoot")
+    ("BuildSuggests")
     ("Conflicts")
-    ("Copyright")
+    ("CVSId")
     ("%description")
     ("Distribution")
     ("DistTag")
     ("DistURL")
     ("DocDir")
+    ("Enhances")
     ("Epoch")
     ("ExcludeArch")
     ("ExcludeOS")
@@ -367,6 +379,8 @@
     ("Group")
     ("Icon")
     ("%ifarch")
+    ("Keyword")
+    ("Keywords")
     ("License")
     ("Name")
     ("NoPatch")
@@ -381,17 +395,40 @@
     ("Provides")
     ("Release")
     ("Requires")
-    ("RHNPlatform")
-    ("Serial")
+    ("RepoTag")
     ("Source")
+    ("Suggests")
     ("Summary")
+    ("SVNId")
     ("URL")
+    ("Variant")
+    ("Variants")
     ("Vendor")
-    ("Version"))
+    ("Version")
+    ("XMajor")
+    ("XMinor")
+    )
   "List of elements that are valid tags.")
 
+(defvar rpm-tags-regexp
+  (concat "\\(\\<" (regexp-opt (mapcar 'car rpm-tags-list))
+	  "\\|\\(Patch\\|Source\\)[0-9]+\\>\\)")
+  "Regular expression for matching valid tags.")
+
+(defvar rpm-obsolete-tags-list
+  ;; From RPM sources, file build/parsePreamble.c: preambleList[].
+  '(("Copyright")    ;; 4.4.2
+    ("RHNPlatform")  ;; 4.4.2, 4.4.9
+    ("Serial")       ;; 4.4.2, 4.4.9
+    )
+  "List of elements that are obsolete tags in some versions of rpm.")
+
+(defvar rpm-obsolete-tags-regexp
+  (regexp-opt (mapcar 'car rpm-obsolete-tags-list) 'words)
+  "Regular expression for matching obsolete tags.")
+
 (defvar rpm-group-tags-list
-  ;; From RPM 4.4.1 sources, file GROUPS.
+  ;; From RPM 4.4.9 sources, file GROUPS.
   '(("Amusements/Games")
     ("Amusements/Graphics")
     ("Applications/Archiving")
@@ -553,11 +590,17 @@
   (list
    (cons rpm-section-regexp rpm-spec-section-face)
    '("%[a-zA-Z0-9_]+" 0 rpm-spec-macro-face)
-   '("^\\([a-zA-Z0-9]+\\)\\(\([a-zA-Z0-9,_]+\)\\):"
-     (1 rpm-spec-tag-face)
-     (2 rpm-spec-ghost-face))
-   '("^\\([a-zA-Z0-9]+\\):" 1 rpm-spec-tag-face)
-   '("%\\(de\\(fine\\|scription\\)\\|files\\|package\\)[ \t]+\\([^-][^ \t\n]*\\)"
+   (cons (concat "^" rpm-obsolete-tags-regexp "\\(\([a-zA-Z0-9,_]+\)\\)[ \t]*:")
+         '((1 'rpm-spec-obsolete-tag-face)
+           (2 'rpm-spec-ghost-face)))
+   (cons (concat "^" rpm-tags-regexp "\\(\([a-zA-Z0-9,_]+\)\\)[ \t]*:")
+         '((1 'rpm-spec-tag-face)
+           (3 'rpm-spec-ghost-face)))
+   (cons (concat "^" rpm-obsolete-tags-regexp "[ \t]*:")
+         '(1 'rpm-spec-obsolete-tag-face))
+   (cons (concat "^" rpm-tags-regexp "[ \t]*:")
+         '(1 'rpm-spec-tag-face))
+   '("%\\(de\\(fine\\|scription\\)\\|files\\|global\\|package\\)[ \t]+\\([^-][^ \t\n]*\\)"
      (3 rpm-spec-package-face))
    '("%p\\(ost\\|re\\)\\(un\\)?[ \t]+\\([^-][^ \t\n]*\\)"
      (3 rpm-spec-package-face))
@@ -798,7 +841,7 @@
           (replace-match
            (concat what ": " (read-from-minibuffer
                               (concat "New " what ": ") (match-string 1))))
-        (message (concat what " tag not found...")))))))
+        (message "%s tag not found..." what))))))
 
 (defun rpm-change-n (what &optional arg)
   "Change given tag with possible number."
@@ -812,7 +855,7 @@
              (concat what number ": "
                      (read-file-name (concat "New " what number " file: ")
                                      "" "" nil (match-string 1)))))
-        (message (concat what " number \"" number "\" not found..."))))))
+        (message "%s number \"%s\" not found..." what number)))))
 
 (defun rpm-insert-group (group)
   "Insert Group tag."
@@ -1001,8 +1044,8 @@
   "Run a `rpmbuild -bp'."
   (interactive "p")
   (if rpm-spec-short-circuit
-      (message (concat "Cannot run `" rpm-spec-build-command
-		       " -bp' with --short-circuit"))
+      (message "Cannot run `%s -bp' with --short-circuit"
+	       rpm-spec-build-command)
     (setq rpm-no-gpg t)
     (rpm-build "-bp")))
 
@@ -1010,8 +1053,8 @@
   "Run a `rpmbuild -bl'."
   (interactive "p")
   (if rpm-spec-short-circuit
-      (message (concat "Cannot run `" rpm-spec-build-command
-		       " -bl' with --short-circuit"))
+      (message "Cannot run `%s -bl' with --short-circuit"
+	       rpm-spec-build-command)
     (setq rpm-no-gpg t)
     (rpm-build "-bl")))
 
@@ -1031,8 +1074,8 @@
   "Run a `rpmbuild -bb'."
   (interactive "p")
   (if rpm-spec-short-circuit
-      (message (concat "Cannot run `" rpm-spec-build-command
-		       " -bb' with --short-circuit"))
+      (message "Cannot run `%s -bb' with --short-circuit"
+	       rpm-spec-build-command)
     (setq rpm-no-gpg nil)
     (rpm-build "-bb")))
 
@@ -1040,8 +1083,8 @@
   "Run a `rpmbuild -bs'."
   (interactive "p")
   (if rpm-spec-short-circuit
-      (message (concat "Cannot run `" rpm-spec-build-command
-		       " -bs' with --short-circuit"))
+      (message "Cannot run `%s -bs' with --short-circuit"
+	       rpm-spec-build-command)
     (setq rpm-no-gpg nil)
     (rpm-build "-bs")))
 
@@ -1049,8 +1092,8 @@
   "Run a `rpmbuild -ba'."
   (interactive "p")
   (if rpm-spec-short-circuit
-      (message (concat "Cannot run `" rpm-spec-build-command
-		       " -ba' with --short-circuit"))
+      (message "Cannot run `%s -ba' with --short-circuit"
+	       rpm-spec-build-command)
     (setq rpm-no-gpg nil)
     (rpm-build "-ba")))
 
@@ -1189,12 +1232,13 @@
   (interactive "p")
   (save-excursion
     (goto-char (point-min))
-    (if (search-forward-regexp "^Release:[ \t]*\\([0-9]+\\)\\(.*\\)" nil t)
-        (let ((release (1+ (string-to-int (match-string 1)))))
-          (setq release (concat (int-to-string release) (match-string 2)))
-          (replace-match (concat "Release: " release))
-          (message (concat "Release tag changed to " release ".")))
-      (if (search-forward-regexp "^Release:[ \t]*%{?\\([^}]*\\)}?$" nil t)
+    (if (search-forward-regexp
+         "^\\(Release[ \t]*:[ \t]*\\)\\([0-9]+\\)\\(.*\\)" nil t)
+        (let ((release (1+ (string-to-int (match-string 2)))))
+          (setq release (concat (int-to-string release) (match-string 3)))
+          (replace-match (concat (match-string 1) release))
+          (message "Release tag changed to %s." release))
+      (if (search-forward-regexp "^Release[ \t]*:[ \t]*%{?\\([^}]*\\)}?$" nil t)
           (rpm-increase-release-with-macros)
         (message "No Release tag found...")))))
 
@@ -1251,7 +1295,7 @@
     (let ((str
            (progn
              (goto-char (point-min))
-             (search-forward-regexp (concat "Release:[ \t]*\\(.+\\).*$") nil)
+             (search-forward-regexp (concat "Release[ \t]*:[ \t]*\\(.+\\).*$") nil)
              (match-string 1))))
       (let ((inrel
              (if (string-match "%{?\\([^}]*\\)}?$" str)
@@ -1268,7 +1312,7 @@
                str)))
         (setq dinrel inrel)
         (replace-match (concat "%define " dinrel))
-        (message (concat "Release tag changed to " dinrel "."))))))
+        (message "Release tag changed to %s." dinrel)))))
 
 ;;------------------------------------------------------------
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Apr 2007 16:52:24 -0000	1.3
+++ .cvsignore	18 May 2007 18:28:32 -0000	1.4
@@ -1 +1 @@
-xemacs-packages-extra-20061221.tar.bz2
+xemacs-packages-extra-20070427.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Apr 2007 16:52:24 -0000	1.3
+++ sources	18 May 2007 18:28:32 -0000	1.4
@@ -1 +1 @@
-7b9193c209dfa8416b62e034efdf7e76  xemacs-packages-extra-20061221.tar.bz2
+f5948a3652f58d0234dddba567d9c59a  xemacs-packages-extra-20070427.tar.bz2


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xemacs-packages-extra.spec	2 Apr 2007 16:52:24 -0000	1.3
+++ xemacs-packages-extra.spec	18 May 2007 18:28:32 -0000	1.4
@@ -2,7 +2,7 @@
 %define xemver  v=$(rpm -q --qf=%%{VERSION} xemacs) ; case $v in 2*) echo $v ;; *) echo 0 ;; esac
 
 Name:           xemacs-packages-extra
-Version:        20061221
+Version:        20070427
 Release:        1%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
@@ -27,8 +27,10 @@
 Patch3:         %{name}-20060510-auctex-texsite-jlatex-detect-69129.patch
 Patch4:         %{name}-20060510-auctex-texjp-platex.patch
 Patch5:         %{name}-20060510-egg-wnn-host-unix-79826.patch
-Patch6:         %{name}-20061221-browsers.patch
+Patch6:         %{name}-20070427-browsers.patch
+Patch7:         %{name}-20070427-jp-locale-239394.patch
 Patch8:         %{name}-20060510-avoid-catch-error-65346.patch
+Patch9:         %{name}-20070427-rpmspec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,7 +41,7 @@
 BuildRequires:  %{__python}
 BuildRequires:  java-devel
 Requires:       xemacs-packages-base = %{version}
-Requires:       xemacs-common >= %(%{xemver})
+Requires:       xemacs(bin) >= %(%{xemver})
 # Fake release in apel provision in order to avoid self-obsoletion (for now).
 Provides:       apel-xemacs = 10.6-6
 Obsoletes:      apel-xemacs < 10.6-6
@@ -97,10 +99,14 @@
 %patch4 -p1
 # make egg-wnn use unix domain socket by default
 %patch5 -p1
-# update browsers in browse-url and psgml-html
+# update browsers in psgml-html
 %patch6 -p1
+# fix -help and splash screen with ja_JP.UTF-8
+%patch7 -p0
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch8 -p1
+# rpm-spec-mode improvements
+%patch9 -p0
 
 [ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
@@ -225,6 +231,11 @@
 
 
 %changelog
+* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 20070427-1
+- 2007-04-27 + upstream post-sumo rpm-spec-mode and locale (#239394) fixes.
+- Improve Japanese splash screen (#239394, Jens Petersen).
+- Require an actual XEmacs editor, not just -common.
+
 * Mon Apr  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061221-1
 - 2006-12-21 + backport of upstream browse-url/xdg-open changes.
 - Drop no longer needed ruby-mode-xemacs Provides/Obsoletes.


--- xemacs-packages-extra-20061221-browsers.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]