Compare commits
No commits in common. "65575cbb28322c191571af4f7103f6226138535e" and "65e4f9864d6a21f53348718232f796ebf3f33e70" have entirely different histories.
65575cbb28
...
65e4f9864d
@ -1,26 +0,0 @@
|
|||||||
--- enscript-1.6.1/src/main.c.locale Mon Mar 18 11:23:14 2002
|
|
||||||
+++ enscript-1.6.1/src/main.c Mon Mar 18 11:24:08 2002
|
|
||||||
@@ -912,9 +912,8 @@
|
|
||||||
* We want to change only messages (gs do not like decimals in 0,1
|
|
||||||
* format ;)
|
|
||||||
*/
|
|
||||||
-#if HAVE_LC_MESSAGES
|
|
||||||
- setlocale (LC_MESSAGES, "");
|
|
||||||
-#endif
|
|
||||||
+ setlocale (LC_ALL, "");
|
|
||||||
+ setlocale (LC_NUMERIC, "C");
|
|
||||||
#endif
|
|
||||||
#if ENABLE_NLS
|
|
||||||
bindtextdomain (PACKAGE, LOCALEDIR);
|
|
||||||
--- enscript-1.6.1/src/psgen.c.locale Mon Mar 18 11:23:14 2002
|
|
||||||
+++ enscript-1.6.1/src/psgen.c Mon Mar 18 11:23:14 2002
|
|
||||||
@@ -1103,7 +1103,8 @@
|
|
||||||
/* Get escape name. */
|
|
||||||
for (i = 0; i < sizeof (escname) - 1 && (ch = is_getc (is)) != EOF; i++)
|
|
||||||
{
|
|
||||||
- if (!isalnum (ch))
|
|
||||||
+ if (!((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z') ||
|
|
||||||
+ (ch >= 'a' && ch <= 'z')))
|
|
||||||
{
|
|
||||||
is_ungetc (ch, is);
|
|
||||||
break;
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up enscript-1.6.4/src/mkafmmap.c.rh457720 enscript-1.6.4/src/mkafmmap.c
|
|
||||||
--- enscript-1.6.4/src/mkafmmap.c.rh457720 2008-08-08 11:33:47.000000000 +0200
|
|
||||||
+++ enscript-1.6.4/src/mkafmmap.c 2008-08-08 11:33:58.000000000 +0200
|
|
||||||
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
|
|
||||||
int option_index = 0;
|
|
||||||
int c;
|
|
||||||
|
|
||||||
- c = getopt_long (argc, argv, "p:h", long_options, &option_index);
|
|
||||||
+ c = getopt_long (argc, argv, "p:hV", long_options, &option_index);
|
|
||||||
if (c == -1)
|
|
||||||
break;
|
|
||||||
|
|
||||||
Binary file not shown.
@ -1,12 +0,0 @@
|
|||||||
diff -up enscript-1.6.5.2/src/psgen.c.bufpos-crash enscript-1.6.5.2/src/psgen.c
|
|
||||||
--- enscript-1.6.5.2/src/psgen.c.bufpos-crash 2013-05-13 16:18:05.119393660 +0100
|
|
||||||
+++ enscript-1.6.5.2/src/psgen.c 2013-05-13 16:19:17.634739778 +0100
|
|
||||||
@@ -1928,7 +1928,7 @@ get_next_token (InputStream *is, double
|
|
||||||
bufpos--;
|
|
||||||
}
|
|
||||||
/* Check the octal notations "\\%03o". */
|
|
||||||
- else if (bufpos - 2 > w
|
|
||||||
+ else if (bufpos > 2 && bufpos - 2 > w
|
|
||||||
&& ISOCTAL (buffer[bufpos])
|
|
||||||
&& ISOCTAL (buffer[bufpos - 1])
|
|
||||||
&& ISOCTAL (buffer[bufpos - 2])
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
diff -up enscript-1.6.6/configure.ac.build enscript-1.6.6/configure.ac
|
|
||||||
--- enscript-1.6.6/configure.ac.build 2012-09-25 21:22:49.000000000 +0200
|
|
||||||
+++ enscript-1.6.6/configure.ac 2012-09-26 15:46:10.988041135 +0200
|
|
||||||
@@ -11,7 +11,6 @@ AC_PROG_INSTALL
|
|
||||||
AC_PROG_CC
|
|
||||||
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
|
||||||
-AM_C_PROTOTYPES
|
|
||||||
|
|
||||||
AC_C_CONST
|
|
||||||
AC_FUNC_ALLOCA
|
|
||||||
File diff suppressed because one or more lines are too long
@ -1,40 +0,0 @@
|
|||||||
diff -up enscript-1.6.6/afm/Makefile.am.rh477382 enscript-1.6.6/afm/Makefile.am
|
|
||||||
--- enscript-1.6.6/afm/Makefile.am.rh477382 2012-09-20 00:17:34.000000000 +0200
|
|
||||||
+++ enscript-1.6.6/afm/Makefile.am 2012-09-26 13:42:09.223974485 +0200
|
|
||||||
@@ -29,9 +29,12 @@ hvnbo.afm hvno.afm hvo.afm ncb.afm ncbi.
|
|
||||||
pobi.afm poi.afm por.afm sy.afm tib.afm tibi.afm tii.afm tir.afm \
|
|
||||||
zcmi.afm zd.afm
|
|
||||||
|
|
||||||
-public_fonts = matrix.afm matrix.pfa
|
|
||||||
+public_fonts = matrix.afm matrix.eps
|
|
||||||
|
|
||||||
afmdir = $(pkgdatadir)/afm
|
|
||||||
dist_afm_DATA = font.map $(default_afm) $(public_fonts) MustRead.html
|
|
||||||
|
|
||||||
EXTRA_DIST = ChangeLog.old
|
|
||||||
+
|
|
||||||
+matrix.eps: matrix.pfa
|
|
||||||
+ cp matrix.pfa matrix.eps
|
|
||||||
diff -up enscript-1.6.6/src/util.c.rh477382 enscript-1.6.6/src/util.c
|
|
||||||
--- enscript-1.6.6/src/util.c.rh477382 2011-10-30 17:48:42.000000000 +0100
|
|
||||||
+++ enscript-1.6.6/src/util.c 2012-09-26 13:40:53.336866463 +0200
|
|
||||||
@@ -1084,9 +1084,16 @@ download_font (char *name)
|
|
||||||
buffer_append (&fname, ".pfb");
|
|
||||||
if (stat (buffer_ptr (&fname), &stat_st) != 0)
|
|
||||||
{
|
|
||||||
- /* Couldn't find font description file, nothing to download. */
|
|
||||||
- buffer_uninit (&fname);
|
|
||||||
- return;
|
|
||||||
+ /* .eps */
|
|
||||||
+ buffer_clear (&fname);
|
|
||||||
+ buffer_append (&fname, prefix);
|
|
||||||
+ buffer_append (&fname, ".eps");
|
|
||||||
+ if (stat (buffer_ptr (&fname), &stat_st) != 0)
|
|
||||||
+ {
|
|
||||||
+ /* Couldn't find font description file, nothing to download. */
|
|
||||||
+ buffer_uninit (&fname);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Binary file not shown.
@ -1,50 +0,0 @@
|
|||||||
diff -up enscript-1.6.5.1/lib/simple.hdr.wrap_header enscript-1.6.5.1/lib/simple.hdr
|
|
||||||
--- enscript-1.6.5.1/lib/simple.hdr.wrap_header 2009-01-24 21:59:34.000000000 +0100
|
|
||||||
+++ enscript-1.6.5.1/lib/simple.hdr 2010-05-21 13:04:28.070346832 +0200
|
|
||||||
@@ -3,6 +3,10 @@
|
|
||||||
% Copyright (c) 1995 Markku Rossi.
|
|
||||||
% Author: Markku Rossi <mtr@iki.fi>
|
|
||||||
%
|
|
||||||
+% Modified: Chris Josefy, USA, MAY 2006
|
|
||||||
+% + Added line wrapping to header to work more like AIX enscript
|
|
||||||
+% + This assumes that one does not change the header font size from the default
|
|
||||||
+% + This also assumes that the line only wraps once
|
|
||||||
|
|
||||||
%
|
|
||||||
% This file is part of GNU Enscript.
|
|
||||||
@@ -24,6 +28,7 @@
|
|
||||||
% -- code follows this line --
|
|
||||||
%Format: fmodstr $D{%a %b %d %H:%M:%S %Y}
|
|
||||||
%Format: pagenumstr $V$%
|
|
||||||
+%HeaderHeight: 44
|
|
||||||
|
|
||||||
/do_header { % print default simple header
|
|
||||||
gsave
|
|
||||||
@@ -39,10 +44,23 @@
|
|
||||||
d_header_w user_header_right_str stringwidth pop sub 5 sub
|
|
||||||
0 moveto user_header_right_str show
|
|
||||||
} {
|
|
||||||
- 5 0 moveto fname show
|
|
||||||
- 45 0 rmoveto fmodstr show
|
|
||||||
- 45 0 rmoveto pagenumstr show
|
|
||||||
- } ifelse
|
|
||||||
+ fname length fmodstr length add pagenumstr length add 95 6 idiv add d_header_w 6 idiv le{
|
|
||||||
+ 5 0 moveto fname show
|
|
||||||
+ 45 0 rmoveto fmodstr show
|
|
||||||
+ 45 0 rmoveto pagenumstr show
|
|
||||||
+ } {
|
|
||||||
+ 5 0 moveto fmodstr show
|
|
||||||
+ 45 0 rmoveto pagenumstr show
|
|
||||||
+ fname length d_header_w 6 idiv idiv 1 add 10 mul 5 exch moveto
|
|
||||||
+ 1 1 fname length d_header_w 6 idiv idiv
|
|
||||||
+ {
|
|
||||||
+ dup fname exch 1 sub d_header_w 6 idiv mul d_header_w 6 idiv getinterval show
|
|
||||||
+ 5 exch 10 mul fname length d_header_w 6 idiv idiv 1 add 10 mul exch sub moveto
|
|
||||||
+ } for
|
|
||||||
+ 5 10 moveto
|
|
||||||
+ fname fname length d_header_w 6 idiv idiv d_header_w 6 idiv mul dup fname length exch sub getinterval show
|
|
||||||
+ }ifelse
|
|
||||||
+ }ifelse
|
|
||||||
|
|
||||||
grestore
|
|
||||||
} def
|
|
||||||
@ -1,83 +0,0 @@
|
|||||||
Name: enscript
|
|
||||||
Version: 1.6.6
|
|
||||||
Release: 21
|
|
||||||
Summary: A plain ASCII to PostScript converter
|
|
||||||
License: GPLv3+
|
|
||||||
URL: http://www.gnu.org/software/enscript
|
|
||||||
Source0: http://ftp.gnu.org/gnu/enscript/enscript-1.6.6.tar.gz
|
|
||||||
Source1: enscript-ruby-1.6.4.tar.gz
|
|
||||||
Source2: enscript-php-1.6.4.st
|
|
||||||
BuildRequires: gcc autoconf automake gettext gettext-devel
|
|
||||||
Provides: nenscript = 1.13++-13
|
|
||||||
Obsoletes: nenscript < 1.13++-13
|
|
||||||
|
|
||||||
Patch0000: enscript-1.6.1-locale.patch
|
|
||||||
Patch0001: enscript-wrap_header.patch
|
|
||||||
Patch0002: enscript-1.6.4-rh457720.patch
|
|
||||||
Patch0003: enscript-rh477382.patch
|
|
||||||
Patch0004: enscript-build.patch
|
|
||||||
Patch0005: enscript-bufpos-crash.patch
|
|
||||||
|
|
||||||
%description
|
|
||||||
GNU enscript is a computer program that converts text files to PostScript,
|
|
||||||
RTF, or HTML formats. If no input files are given, enscript processes standard input.
|
|
||||||
Enscript can be extended to handle different output media and it has many options
|
|
||||||
which can be used to customize print-outs.
|
|
||||||
|
|
||||||
%package help
|
|
||||||
Summary: Help documents for enscript
|
|
||||||
|
|
||||||
%description help
|
|
||||||
The enscript-help package contains manual pages and other related files for enscript.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -p1
|
|
||||||
|
|
||||||
%{__tar} -C states/hl -zxf %{SOURCE1} ruby.st
|
|
||||||
install -pm 644 %{SOURCE2} states/hl/php.st
|
|
||||||
|
|
||||||
%build
|
|
||||||
autoreconf -fiv
|
|
||||||
export CPPFLAGS='-DPROTOTYPES'
|
|
||||||
%configure --with-media=Letter
|
|
||||||
%make_build
|
|
||||||
|
|
||||||
%install
|
|
||||||
install -d %{buildroot}%{_datadir}/locale/{de,es,fi,fr,nl,sl}/LC_MESSAGES
|
|
||||||
%make_install
|
|
||||||
|
|
||||||
%find_lang enscript
|
|
||||||
|
|
||||||
( cd %{buildroot}
|
|
||||||
ln .%{_prefix}/bin/enscript .%{_prefix}/bin/nenscript
|
|
||||||
)
|
|
||||||
|
|
||||||
%find_lang enscript enscript.lang
|
|
||||||
|
|
||||||
for all in README THANKS; do
|
|
||||||
iconv -f ISO88591 -t UTF8 < $all > $all.new
|
|
||||||
touch -r $all $all.new
|
|
||||||
mv $all.new $all
|
|
||||||
done
|
|
||||||
|
|
||||||
%files -f enscript.lang
|
|
||||||
%doc AUTHORS ChangeLog COPYING
|
|
||||||
%{_bindir}/*
|
|
||||||
%{_datadir}/enscript/*
|
|
||||||
%config(noreplace) %{_sysconfdir}/enscript.cfg
|
|
||||||
%exclude %{_datadir}/info/dir
|
|
||||||
|
|
||||||
%files help
|
|
||||||
%doc docs/FAQ.html NEWS README README.ESCAPES THANKS TODO
|
|
||||||
%{_mandir}/man1/*
|
|
||||||
%{_infodir}/enscript*
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Wed Oct 9 2024 lvzhonglin<lvzhonglin@inspur.com> - 1.6.6-21
|
|
||||||
- update package description
|
|
||||||
|
|
||||||
* Mon Sep 7 2020 baizhonggui<baizhonggui@huawei.com> - 1.6.6-20
|
|
||||||
- Modify Source0
|
|
||||||
|
|
||||||
* Thu Nov 21 2019 liujing<liujing144@huawei.com> - 1.6.6-19
|
|
||||||
- Package init
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: git
|
|
||||||
src_repo: git://git.savannah.gnu.org/enscript.git
|
|
||||||
tag_prefix: ^v
|
|
||||||
seperator: .
|
|
||||||
Loading…
x
Reference in New Issue
Block a user