commit a2ps for openSUSE:Factory
Hello community,
here is the log from the commit of package a2ps for openSUSE:Factory checked in at 2017-06-05 18:50:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/a2ps (Old)
and /work/SRC/openSUSE:Factory/.a2ps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "a2ps"
Mon Jun 5 18:50:39 2017 rev:42 rq:501137 version:4.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/a2ps/a2ps.changes 2016-03-17 16:47:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps.changes 2017-06-05 18:51:17.221226420 +0200
@@ -1,0 +2,7 @@
+Mon May 29 10:59:28 UTC 2017 - werner@suse.de
+
+- Split off patch a2ps-4.14-manuals.diff as otherwise we might
+ not patch the final manual page
+- Avoid broken macro in manual page templates
+
+-------------------------------------------------------------------
New:
----
a2ps-4.14-manuals.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ a2ps.spec ++++++
--- /var/tmp/diff_new_pack.3bhQvp/_old 2017-06-05 18:51:18.133097883 +0200
+++ /var/tmp/diff_new_pack.3bhQvp/_new 2017-06-05 18:51:18.137097319 +0200
@@ -1,7 +1,7 @@
#
# spec file for package a2ps
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,7 @@
Source2: %{name}.keyring
Source3: a2ps-ko.po
Source4: a2ps-open
+Source5: a2ps-4.14-manuals.diff
Patch0: a2ps-4.14.diff
Patch1: a2ps-4.13-security.patch
Patch2: a2ps-4.14-ogonkify.patch
@@ -55,6 +56,7 @@
BuildRequires: gv
BuildRequires: psutils
BuildRequires: texlive-latex
+BuildRequires: timezone
Requires: file
Requires: ghostscript-fonts-std
Requires: glibc
@@ -140,6 +142,7 @@
export CFLAGS="%{optflags} -D_GNU_SOURCE -funroll-loops -Wall -pipe -fstack-protector -fPIE"
export LPR=lpr
export CC=gcc
+ export TZ=UTC
%configure --enable-shared --disable-static --with-pic --with-medium=LC_PAPER \
--with-encoding=LC_CTYPE
con=""
@@ -169,6 +172,13 @@
HOME=$PWD/.root \
LC_CTYPE=en_US.UTF-8 ./src/a2ps --output=test.latin test.utf8
grep '(This is a test text' test.latin | iconv -f latin1 -t utf8
+ chmod u+rw,g+r,o+r man/*.1
+ cp -p man/a2ps.1 man/a2ps.1.backup
+ patch --reject-format=unified --quoting-style=literal -f -p0 -F0 < %{S:5} || :
+ if test -e man/a2ps.1.rej ; then
+ cat man/a2ps.1.rej
+ exit 1
+ fi
%install
make install DESTDIR=%{buildroot} PSFONT_PATH=%{_datadir}/ghostscript/fonts
++++++ a2ps-4.14-manuals.diff ++++++
---
man/a2ps.1 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- man/a2ps.1
+++ man/a2ps.1 2014-08-07 14:32:29.000000000 +0000
@@ -3,7 +3,7 @@
.SH NAME
a2ps \- format files for printing on a PostScript printer
.SH SYNOPSIS
-.B lt-a2ps
+.B a2ps
[\fIOPTION\fR]... [\fIFILE\fR]...
.SH DESCRIPTION
.\" Add any additional description here
@@ -81,8 +81,7 @@ first fill (DIRECTION=) rows, or columns
predefined font sizes and layouts for 1.. 9 virtuals
.TP
\fB\-A\fR, \fB\-\-file\-align\fR=\fIMODE\fR
-align separate files according to MODE (fill, rank
-page, sheet, or a number)
+align separate files according to MODE (`virtual', `rank', `page', `sheet', or a number)
.TP
\fB\-j\fR, \fB\-\-borders\fR*
print borders around columns
++++++ a2ps-4.14.diff ++++++
--- /var/tmp/diff_new_pack.3bhQvp/_old 2017-06-05 18:51:18.217086044 +0200
+++ /var/tmp/diff_new_pack.3bhQvp/_new 2017-06-05 18:51:18.221085480 +0200
@@ -24,7 +24,12 @@
lib/options.c | 23 ++++++++++++++++++++++-
lib/path-concat.c | 7 +++----
lib/xstrrpl.c | 1 +
- man/a2ps.1 | 3 +--
+ man/a2ps.x | 2 +-
+ man/card.x | 2 +-
+ man/fixps.x | 2 +-
+ man/pdiff.x | 2 +-
+ man/psmandup.x | 2 +-
+ man/psset.x | 2 +-
ogonkify/Makefile.in | 2 +-
ogonkify/ogonkify.in.in | 2 +-
ogonkify/pcrb-o.afm | 3 ++-
@@ -40,10 +45,10 @@
ogonkify/ptmr-o.afm | 3 ++-
ogonkify/ptmri-o.afm | 3 ++-
src/main.c | 14 +++++++++++++-
- 41 files changed, 190 insertions(+), 46 deletions(-)
+ 46 files changed, 195 insertions(+), 50 deletions(-)
--- afm/fontsmap
-+++ afm/fontsmap 2015-03-02 11:12:19.889518618 +0000
++++ afm/fontsmap 2017-05-29 10:31:00.730583938 +0000
@@ -47,6 +47,14 @@ Bookman-Demi pbkd
Bookman-DemiItalic pbkdi
Bookman-Light pbkl
@@ -117,7 +122,7 @@
ZapfChancery-MediumItalic pzcmi
ZapfDingbats pzdr
--- afm/pcrb.afm
-+++ afm/pcrb.afm 2015-03-02 11:25:16.821630267 +0000
++++ afm/pcrb.afm 2017-05-29 10:31:00.730583938 +0000
@@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 84
@@ -136,7 +141,7 @@
C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 578 562 ;
C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ;
--- afm/pcrbo.afm
-+++ afm/pcrbo.afm 2015-03-02 11:25:37.897517874 +0000
++++ afm/pcrbo.afm 2017-05-29 10:31:00.734583863 +0000
@@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 84
@@ -155,7 +160,7 @@
C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 636 562 ;
C -1 ; WX 600 ; N Atilde ; B -9 0 669 759 ;
--- afm/pcrr.afm
-+++ afm/pcrr.afm 2015-03-02 11:26:49.557518929 +0000
++++ afm/pcrr.afm 2017-05-29 10:31:00.734583863 +0000
@@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 51
@@ -174,7 +179,7 @@
C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 554 562 ;
C -1 ; WX 600 ; N Atilde ; B 3 0 597 729 ;
--- afm/pcrro.afm
-+++ afm/pcrro.afm 2015-03-02 11:27:09.441659325 +0000
++++ afm/pcrro.afm 2017-05-29 10:31:00.738583789 +0000
@@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 51
@@ -193,7 +198,7 @@
C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 607 562 ;
C -1 ; WX 600 ; N Atilde ; B 3 0 655 729 ;
--- afm/phvb.afm
-+++ afm/phvb.afm 2015-03-02 11:27:26.974018785 +0000
++++ afm/phvb.afm 2017-05-29 10:31:00.750583563 +0000
@@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 118
@@ -212,7 +217,7 @@
C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 583 718 ;
C -1 ; WX 722 ; N Atilde ; B 20 0 702 923 ;
--- afm/phvbo.afm
-+++ afm/phvbo.afm 2015-03-02 11:27:51.946018640 +0000
++++ afm/phvbo.afm 2017-05-29 10:31:00.762583338 +0000
@@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 118
@@ -231,7 +236,7 @@
C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 611 718 ;
C -1 ; WX 722 ; N Atilde ; B 20 0 741 923 ;
--- afm/phvr.afm
-+++ afm/phvr.afm 2015-03-02 11:28:14.677519094 +0000
++++ afm/phvr.afm 2017-05-29 10:31:00.774583114 +0000
@@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 76
@@ -250,7 +255,7 @@
C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 537 718 ;
C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ;
--- afm/phvro.afm
-+++ afm/phvro.afm 2015-03-02 11:28:32.318018677 +0000
++++ afm/phvro.afm 2017-05-29 10:31:00.790582814 +0000
@@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 76
@@ -269,7 +274,7 @@
C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 555 718 ;
C -1 ; WX 667 ; N Atilde ; B 14 0 699 917 ;
--- afm/ptmb.afm
-+++ afm/ptmb.afm 2015-03-02 11:28:49.234018769 +0000
++++ afm/ptmb.afm 2017-05-29 10:31:00.798582663 +0000
@@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 44
@@ -288,7 +293,7 @@
C -1 ; WX 667 ; N Lcommaaccent ; B 19 -218 638 676 ;
C -1 ; WX 722 ; N Atilde ; B 9 0 689 884 ;
--- afm/ptmbi.afm
-+++ afm/ptmbi.afm 2015-03-02 11:29:07.549519056 +0000
++++ afm/ptmbi.afm 2017-05-29 10:31:00.810582439 +0000
@@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 42
@@ -307,7 +312,7 @@
C -1 ; WX 611 ; N Lcommaaccent ; B -22 -218 590 669 ;
C -1 ; WX 667 ; N Atilde ; B -67 0 593 862 ;
--- afm/ptmi.afm
-+++ afm/ptmi.afm 2015-03-02 11:29:33.353519026 +0000
++++ afm/ptmi.afm 2017-05-29 10:31:00.822582213 +0000
@@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 32
@@ -326,7 +331,7 @@
C -1 ; WX 556 ; N Lcommaaccent ; B -8 -217 559 653 ;
C -1 ; WX 611 ; N Atilde ; B -51 0 566 836 ;
--- afm/ptmr.afm
-+++ afm/ptmr.afm 2015-03-02 11:29:56.738018858 +0000
++++ afm/ptmr.afm 2017-05-29 10:31:00.830582063 +0000
@@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 28
@@ -345,7 +350,7 @@
C -1 ; WX 611 ; N Lcommaaccent ; B 12 -218 598 662 ;
C -1 ; WX 722 ; N Atilde ; B 15 0 706 850 ;
--- configure.in
-+++ configure.in 2015-03-02 11:15:46.993517948 +0000
++++ configure.in 2017-05-29 10:31:00.850581688 +0000
@@ -207,8 +207,9 @@ AC_MSG_CHECKING(for PostScript fonts pat
# Try to find some PostScript fonts.
# Find out if ghostscript is installed
@@ -359,7 +364,7 @@
if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
ac_psfont_path="$ac_psfont_path:$ac_dir";
--- configure
-+++ configure 2014-08-07 04:32:04.000000000 +0000
++++ configure 2017-05-29 10:31:00.998578914 +0000
@@ -30759,8 +30759,9 @@ echo $ECHO_N "checking for PostScript fo
# Try to find some PostScript fonts.
# Find out if ghostscript is installed
@@ -373,7 +378,7 @@
if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
ac_psfont_path="$ac_psfont_path:$ac_dir";
--- contrib/emacs/a2ps.el
-+++ contrib/emacs/a2ps.el 2014-08-07 05:23:41.000000000 +0000
++++ contrib/emacs/a2ps.el 2017-05-29 10:30:59.934598860 +0000
@@ -44,7 +44,7 @@
;; a2ps-compile-regexp
@@ -384,7 +389,7 @@
;;thank god for make-regexp.el!
(defvar a2ps-font-lock-keywords
--- doc/Makefile.in
-+++ doc/Makefile.in 2015-03-02 11:22:54.806018972 +0000
++++ doc/Makefile.in 2017-05-29 10:31:01.002578839 +0000
@@ -146,7 +146,7 @@ GNU_PACKAGE = @GNU_PACKAGE@
GPERF = @GPERF@
GREP = @GREP@
@@ -395,7 +400,7 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
--- encoding/encoding.map
-+++ encoding/encoding.map 2014-08-07 05:30:00.000000000 +0000
++++ encoding/encoding.map 2017-05-29 10:31:00.378590536 +0000
@@ -84,6 +84,10 @@ iso15 iso15
latin9 iso15
latin0 iso15
@@ -408,7 +413,7 @@
########################################################################
# Other encodings
--- etc/Makefile.in
-+++ etc/Makefile.in 2014-08-07 05:31:54.000000000 +0000
++++ etc/Makefile.in 2017-05-29 10:31:01.002578839 +0000
@@ -482,7 +482,7 @@ uninstall-local:
# Building the correct a2ps.cfg
@@ -419,7 +424,7 @@
# Building a time stamp to know the version.
README: README.in Makefile
--- etc/a2ps_cfg.in
-+++ etc/a2ps_cfg.in 2014-08-07 05:38:23.000000000 +0000
++++ etc/a2ps_cfg.in 2017-05-29 10:31:00.090595935 +0000
@@ -58,6 +58,39 @@ Medium: Folio 612 936
Medium: Quarto 610 780
Medium: 10x14 720 1008
@@ -482,7 +487,7 @@
# Used for the `pdf' printer.
# Use as `#{ps2pdf} INPUT OUTPUT'.
--- lib/jobs.c
-+++ lib/jobs.c 2014-08-07 05:41:30.000000000 +0000
++++ lib/jobs.c 2017-05-29 10:31:00.298592037 +0000
@@ -135,10 +135,18 @@ a2ps_job_new (void)
/* Set the NLS on */
@@ -504,7 +509,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--- lib/metaseq.c
-+++ lib/metaseq.c 2014-08-07 05:46:14.000000000 +0000
++++ lib/metaseq.c 2017-05-29 10:31:00.110595560 +0000
@@ -205,7 +205,7 @@ grow_user_string_obstack (struct obstack
int justification = 1;
@@ -515,7 +520,7 @@
int type;
--- lib/options.c
-+++ lib/options.c 2015-03-02 11:08:10.593519054 +0000
++++ lib/options.c 2017-05-29 10:31:00.098595785 +0000
@@ -54,11 +54,14 @@
#include "argv.h"
#include "quotearg.h"
@@ -565,7 +570,7 @@
* the encoding.map has not been read yet (because to read
* encoding.map, one has to know the lib path, and to know
--- lib/path-concat.c
-+++ lib/path-concat.c 2014-08-07 14:27:19.000000000 +0000
++++ lib/path-concat.c 2017-05-29 10:31:00.314591736 +0000
@@ -21,10 +21,6 @@
# include
participants (1)
-
root@hilbert.suse.de