[itext] Fix build issue with un-ASCII-mappable characters. Fix build issue inconsistent use of mavenpomdir.
Andrew Robinson
arobinso at fedoraproject.org
Wed Nov 30 20:19:05 UTC 2011
commit 3445e086d1a96eb1ad7b8c78d45f7d4741c3bcae
Author: Andrew Robinson <arobinso at redhat.com>
Date: Wed Nov 30 15:18:45 2011 -0500
Fix build issue with un-ASCII-mappable characters.
Fix build issue inconsistent use of mavenpomdir.
itext-remove-unmappable.patch | 11 +++++++++++
itext-xmloutput.patch | 10 +++++-----
itext.spec | 10 ++++++++--
3 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/itext-remove-unmappable.patch b/itext-remove-unmappable.patch
new file mode 100644
index 0000000..3d1cb07
--- /dev/null
+++ b/itext-remove-unmappable.patch
@@ -0,0 +1,11 @@
+--- ./src/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationStylesheetTable.java.orig 2011-11-30 13:55:58.490387384 -0500
++++ ./src/rtf/com/lowagie/text/rtf/parser/destinations/RtfDestinationStylesheetTable.java 2011-11-30 13:55:13.465100610 -0500
+@@ -91,7 +91,7 @@ public class RtfDestinationStylesheetTab
+ */
+ private int alignment = Element.ALIGN_LEFT;
+ /**
++ * Percentage of line occupied by Kashida justification (0 low, 10 medium, 20 high).
+- * Percentage of line occupied by Kashida justification (0 � low, 10 � medium, 20 � high).
+ * \qkN
+ */
+ private int justificationPercentage = 0;
diff --git a/itext-xmloutput.patch b/itext-xmloutput.patch
index 042827d..b369a59 100644
--- a/itext-xmloutput.patch
+++ b/itext-xmloutput.patch
@@ -641,7 +641,7 @@ Index: src/core/com/lowagie/text/rtf/RtfTOC.java
+ * where applicable.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the
-+ * LGPL license (the �GNU LIBRARY GENERAL PUBLIC LICENSE�), in which case the
++ * LGPL license (the GNU LIBRARY GENERAL PUBLIC LICENSE), in which case the
+ * provisions of LGPL are applicable instead of those above. If you wish to
+ * allow use of your version of this file only under the terms of the LGPL
+ * License and not to allow others to use your version of this file under
@@ -3566,7 +3566,7 @@ Index: src/core/com/lowagie/text/rtf/AbstractRtfField.java
+ * where applicable.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the
-+ * LGPL license (the “GNU LIBRARY GENERAL PUBLIC LICENSE”), in which case the
++ * LGPL license (the GNU LIBRARY GENERAL PUBLIC LICENSE), in which case the
+ * provisions of LGPL are applicable instead of those above. If you wish to
+ * allow use of your version of this file only under the terms of the LGPL
+ * License and not to allow others to use your version of this file under
@@ -5412,7 +5412,7 @@ Index: src/core/com/lowagie/text/rtf/GenericRtfField.java
+ * where applicable.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the
-+ * LGPL license (the “GNU LIBRARY GENERAL PUBLIC LICENSE”), in which case the
++ * LGPL license (the GNU LIBRARY GENERAL PUBLIC LICENSE), in which case the
+ * provisions of LGPL are applicable instead of those above. If you wish to
+ * allow use of your version of this file only under the terms of the LGPL
+ * License and not to allow others to use your version of this file under
@@ -5556,7 +5556,7 @@ Index: src/core/com/lowagie/text/rtf/RtfTOCEntry.java
+ * where applicable.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the
-+ * LGPL license (the �GNU LIBRARY GENERAL PUBLIC LICENSE�), in which case the
++ * LGPL license (the GNU LIBRARY GENERAL PUBLIC LICENSE), in which case the
+ * provisions of LGPL are applicable instead of those above. If you wish to
+ * allow use of your version of this file only under the terms of the LGPL
+ * License and not to allow others to use your version of this file under
@@ -5857,7 +5857,7 @@ Index: src/core/com/lowagie/text/rtf/RtfField.java
+ * where applicable.
+ *
+ * Alternatively, the contents of this file may be used under the terms of the
-+ * LGPL license (the “GNU LIBRARY GENERAL PUBLIC LICENSE”), in which case the
++ * LGPL license (the GNU LIBRARY GENERAL PUBLIC LICENSE), in which case the
+ * provisions of LGPL are applicable instead of those above. If you wish to
+ * allow use of your version of this file only under the terms of the LGPL
+ * License and not to allow others to use your version of this file under
diff --git a/itext.spec b/itext.spec
index 4974966..6209b59 100644
--- a/itext.spec
+++ b/itext.spec
@@ -4,7 +4,7 @@
Summary: A Free Java-PDF library
Name: itext
Version: 2.1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
License: (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and LGPLv2+
URL: http://www.lowagie.com/iText/
Group: Development/Libraries
@@ -46,6 +46,7 @@ Patch2: itext-2.1.7-fixpomforbc.patch
Patch3: itext-xmloutput.patch
# Use orbit manifest so the manifest exports packages properly.
Patch4: itext-manifest.patch
+Patch5: itext-remove-unmappable.patch
BuildRequires: ant
BuildRequires: bouncycastle-tsp
@@ -139,6 +140,7 @@ cp -pr %{SOURCE2} JPP-itext.pom
%patch2 -p0 -b .fixpomforbc
%patch3 -p0 -b .xmloutput
%patch4 -p0
+%patch5 -p0
# move manifest to build area
tar -xf %{SOURCE7}
@@ -219,7 +221,7 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# Install the pom
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
cp -pr JPP-itext.pom $RPM_BUILD_ROOT%{_mavenpomdir}
%add_to_maven_depmap itext itext %{version} JPP itext
%add_to_maven_depmap com.lowagie itext %{version} JPP itext
@@ -321,6 +323,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# -----------------------------------------------------------------------------
%changelog
+* Wed Nov 30 2011 Andrew Robinson <arobinso at redhat.com> 2.1.7-9
+- Fix build issue with un-ASCII-mappable characters.
+- Fix build issue inconsistent use of mavenpomdir.
+
* Fri Nov 25 2011 Andrew Robinson <arobinso at redhat.com> 2.1.7-8
- Add orbit manifest so manifest lists package exports correctly.
More information about the scm-commits
mailing list