auto-import enscript-1.6.1-18 from enscript-1.6.1-18.src.rpm

This commit is contained in:
cvsdist 2004-09-09 04:33:20 +00:00
parent 517910a02e
commit 2b2c189683
2 changed files with 34 additions and 3 deletions

View File

@ -0,0 +1,26 @@
--- 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;

View File

@ -1,13 +1,14 @@
Summary: A plain ASCII to PostScript converter. Summary: A plain ASCII to PostScript converter.
Name: enscript Name: enscript
Version: 1.6.1 Version: 1.6.1
Release: 16.2s.1 Release: 18
License: GNU License: GNU
Group: Applications/Publishing Group: Applications/Publishing
Source0: ftp://ftp.gnu.org/pub/gnu/enscript-%{version}.tar.gz Source0: ftp://ftp.gnu.org/pub/gnu/enscript-%{version}.tar.gz
Patch0: enscript-1.6.1-config.patch Patch0: enscript-1.6.1-config.patch
Patch1: enscript-1.6.1-mail.patch Patch1: enscript-1.6.1-mail.patch
Patch2: enscript-1.6.1-tmp.patch Patch2: enscript-1.6.1-tmp.patch
Patch3: enscript-1.6.1-locale.patch
URL: http://www.ngs.fi/mtr/genscript/index.html URL: http://www.ngs.fi/mtr/genscript/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Obsoletes: nenscript Obsoletes: nenscript
@ -24,6 +25,7 @@ includes many options for customizing printouts.
%patch0 -p1 -b .config %patch0 -p1 -b .config
%patch1 -p1 -b .mail %patch1 -p1 -b .mail
%patch2 -p1 -b .tmp %patch2 -p1 -b .tmp
%patch3 -p1 -b .locale
%build %build
%configure --with-media=Letter %configure --with-media=Letter
@ -59,8 +61,11 @@ rm -rf %{buildroot}
%doc AUTHORS ChangeLog FAQ.html NEWS README README.ESCAPES THANKS TODO %doc AUTHORS ChangeLog FAQ.html NEWS README README.ESCAPES THANKS TODO
%changelog %changelog
* Wed Mar 18 2003 D. Marlin <dmarlin@redhat.com> * Mon Mar 18 2002 Tim Waugh <twaugh@redhat.com> 1.6.1-18
- new s390 release number and rebuild for s390 (bug #85960) - Fix locale issues (bug #61294).
* Mon Feb 04 2002 Tim Waugh <twaugh@redhat.com> 1.6.1-17
- Rebuild in new environment.
* Mon Jan 14 2002 Tim Waugh <twaugh@redhat.com> 1.6.1-16.2 * Mon Jan 14 2002 Tim Waugh <twaugh@redhat.com> 1.6.1-16.2
- Use tmpfile instead of tmpnam or tempnam (bug #57704). - Use tmpfile instead of tmpnam or tempnam (bug #57704).