Accepting request 265238 from home:keichwa:branches:Publishing

update

OBS-URL: https://build.opensuse.org/request/show/265238
OBS-URL: https://build.opensuse.org/package/show/Publishing/psgml?expand=0&rev=13

flavour.patch

@@ -9,37 +9,6 @@
    (let ((default-directory psgml-source-dir)
  	(load-path (cons psgml-source-dir load-path)))
      (mapcar (function psgml-byte-compile-file)
---- psgml-parse.el
-+++ psgml-parse.el	2012-07-02 13:03:42.892010400 +0000
-@@ -440,7 +440,7 @@ Applicable to XML.")
- ;; set of moves: list of moves
- 
- (defmacro sgml-add-move-to-set (token node set)
--  (`(cons (cons (, token) (, node)) (, set))))
-+  `(cons (cons ,token ,node) , set))
- 
- (defmacro sgml-moves-lookup (token set)
-   (` (assq (, token) (, set))))
-@@ -460,7 +460,7 @@ Applicable to XML.")
-   (` (cddr (, s))))
- 
- (defmacro sgml-state-final-p (s)
--  (`(null (sgml-state-reqs (, s)))))
-+  `(null (sgml-state-reqs ,s)))
- 
- ;; adding moves
- ;; *** Should these functions check for ambiguity?
-@@ -904,8 +904,8 @@ If ATTSPEC is nil, nil is returned."
-   (cons
-    'progn
-    (loop for n in names collect
--	 (`(defmacro (, (intern (format "sgml-eltype-%s" n))) (et)
--	     (list 'get et ''(, n)))))))
-+	 `(defmacro ,(intern (format "sgml-eltype-%s" n)) (et)
-+	     (list 'get et '',n)))))
- 
- (sgml-prop-fields
-  ;;flags			; optional tags and mixed
 --- xxml.el
 +++ xxml.el	2012-07-02 12:28:42.168509922 +0000
 @@ -293,7 +293,7 @@ Use nil to silence all progress.")

psgml-1.3.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a020bfe9ab75e325e738726dd850e2b17030b3a5a2c0a349070839865ff51905
-size 252394

psgml-1.4.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39f3e110ff9f426c0f89511f4dae9967ec4400aaee6220c07ef914bbf519073d
+size 205337

psgml.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 15 11:59:34 UTC 2014 - ke@suse.de
+
+- Update from https://marmalade-repo.org/packages/psgml-1.4.1.tar;
+  bnc#909627.
+- Cleanup spec file.
+
 -------------------------------------------------------------------
 Sat Sep 15 10:33:34 UTC 2012 - idonmez@suse.com
 

psgml.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package psgml
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,16 +27,15 @@ Requires:       emacs_program
 Summary:        Emacs Add-On to edit SGML/XML documents
 License:        GPL-2.0+ and SUSE-Public-Domain
 Group:          Productivity/Editors/Emacs
-Version:        1.3.2
+Version:        1.4.1
 Release:        0
-# Source:       http://belnet.dl.sourceforge.net/sourceforge/psgml/psgml-%{version}.tar.bz2
+Source:         https://marmalade-repo.org/packages/psgml-%{version}.tar.bz2
-Source:         ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/psgml-%{version}.tar.gz
 Source1:        http://home.sprynet.com/sprynet/dmeggins/psgml-dsssl.el
 Source2:        http://logimac.mathematik.uni-freiburg.de/mixed/psgml-ja.tgz
 Source3:        http://www.menteith.com/tdtd/data/tdtd.zip
 Source4:        http://www.iro.umontreal.ca/~pinard/xxml/xxml.tar.gz
 Source5:        http://www.megginson.com/Software/psgml-xpointer.el
-Source6:        %{name}-README.SuSE
+Source6:        %{name}-README.openSUSE
 Source7:        ke-docbook.el
 Source8:        suse-start-psgml.el
 Source9:        psgml-html.el
@@ -60,7 +59,7 @@ elements and attributes.
 
 Included are several helper tools: tdtd, xxml, psgml-xpointer.
 
-For more info see README.SuSE.
+For more info see README.openSUSE.
 
 Compiled for GNU Emacs (XEmacs has its own version!).
 
@@ -72,7 +71,8 @@ Authors:
     Lennart Staflin <lenst@lysator.liu.se>
     David Megginson <dmeggins@sprynet.com>
     Matthias Clasen <mclasen@sun2.mathematik.uni-freiburg.de>
-    François Pinard <pinard@iro.umontreal.ca>
+    François Pinard <pinard@iro.umontreal.ca>
+    etc.
 
 %prep
 %setup -q
@@ -163,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc INSTALL README.psgml README.SuSE
+%doc README.psgml README.openSUSE
 %doc README.xxml THANKS.xxml
 %doc psgml-jade
 %doc tdtd-readme.txt tdtd-tutorial.txt tdtd.dot.emacs