[par] Removed all par_1.52-i18n patches because they still have bugs [Bug 962221].
David Levine
levined at fedoraproject.org
Sat Jan 10 17:08:20 UTC 2015
commit cdac9e16ebc9844f3e265f18b9e05e8f9a33feca
Author: David Levine <levinedl at acm.org>
Date: Sat Jan 10 11:08:07 2015 -0600
Removed all par_1.52-i18n patches because they still have bugs
[Bug 962221].
par.c.diff | 19 ++++++++-----------
par.spec | 16 +++++-----------
par_1.52-i18n.4.diff.gz | Bin 1070 -> 0 bytes
par_1.52-i18n.5.diff.gz | Bin 356 -> 0 bytes
sources | 1 -
5 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/par.c.diff b/par.c.diff
index 6b941f9..d108adc 100644
--- a/par.c.diff
+++ b/par.c.diff
@@ -1,16 +1,13 @@
--- Par152/par.c.orig Sun Mar 28 16:00:15 2004
-+++ Par152/par.c Sun Mar 28 16:04:00 2004
-@@ -421,10 +421,11 @@
++++ Par152/par.c Sat Jan 10 10:59:46 2015
+@@ -403,7 +403,9 @@
}
continue;
}
-- if (isspace(c))
-- c = ' ';
-+ /* Fix from Jean-Baptiste Quenot <jb.quenot at caraldi.com>:
+- if (isspace(c)) ch = ' ';
++ /* Based on fix from Jean-Baptiste Quenot <jb.quenot at caraldi.com>:
+ * Exclude non-breaking space from the class of space chars */
-+ if (isspace(c) && isascii(c)) c = ' ';
- else
- blank = 0;
- additem(cbuf, &c, errmsg);
- if (*errmsg)
- goto rlcleanup;
++ if (isspace(c) && isascii(c)) ch = ' ';
+ else blank = 0;
+ additem(cbuf, &ch, errmsg);
+ if (*errmsg) goto rlcleanup;
diff --git a/par.spec b/par.spec
index 435fcdd..0ddac17 100644
--- a/par.spec
+++ b/par.spec
@@ -1,17 +1,11 @@
Summary: Paragraph reformatter, vaguely like fmt, but more elaborate
Name: par
Version: 1.52
-Release: 15%{?dist}
+Release: 16%{?dist}
License: Par
Group: Applications/Text
Source0: http://www.nicemice.net/par/Par152.tar.gz
-Patch1: http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz
-Patch2: par_1.52-i18n.4.diff.gz
-# Patch3 derived from:
-# http://www.freebsd.org/cgi/cvsweb.cgi/ports/textproc/par/files/patch-par.c
-# and then manually adjusted to be compatible with Patch1.
-Patch3: par.c.diff
-Patch4: par_1.52-i18n.5.diff.gz
+Patch1: par.c.diff
URL: http://www.nicemice.net/par/
%description
@@ -35,9 +29,6 @@ all end in the same column.
%prep
%setup -q -n Par152
%patch1 -p 1
-%patch2 -p 1
-%patch3 -p 1
-%patch4 -p 1
%build
@@ -58,6 +49,9 @@ install -m 644 par.1 %{buildroot}/%{_mandir}/man1
%changelog
+* Sat Jan 10 2015 David Levine <par.packager at gmail.com> - 1.52-15
+- Removed all par_1.52-i18n patches because they still have bugs [Bug 962221].
+
* Thu Dec 25 2014 David Levine <par.packager at gmail.com> - 1.52-14
- Added protection against null dereference to previous patch.
diff --git a/sources b/sources
index d963cea..32ce455 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
4ccacd824171ba2c2f14fb8aba78b9bf Par152.tar.gz
-e79b448cb14323a39d817afce4847cdf par_1.52-i18n.3.diff.gz
More information about the scm-commits
mailing list