[pdftk/f17] Remove workarout for #712013 (Requires gcc 4.7.0-1 as minimum)
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Apr 19 15:26:42 UTC 2012
commit 060c29f2270f639f5dc59a24a38b1cee0c36ae37
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Thu Apr 19 17:17:19 2012 +0200
Remove workarout for #712013 (Requires gcc 4.7.0-1 as minimum)
- Package cleanup
pdftk-1.44-gcjfix.patch | 21 +++++++++++++++++++++
pdftk.spec | 22 ++++++++++++----------
2 files changed, 33 insertions(+), 10 deletions(-)
---
diff --git a/pdftk-1.44-gcjfix.patch b/pdftk-1.44-gcjfix.patch
new file mode 100644
index 0000000..156a8dc
--- /dev/null
+++ b/pdftk-1.44-gcjfix.patch
@@ -0,0 +1,21 @@
+diff -up pdftk-1.44-dist/pdftk/pdftk.cc.gcjfix pdftk-1.44-dist/pdftk/pdftk.cc
+--- pdftk-1.44-dist/pdftk/pdftk.cc.gcjfix 2012-04-19 16:32:57.800116446 +0200
++++ pdftk-1.44-dist/pdftk/pdftk.cc 2012-04-19 16:33:58.191870224 +0200
+@@ -2884,17 +2884,6 @@ int main(int argc, char** argv)
+ sigprocmask( SIG_SETMASK, &sigmask, 0 );
+ #endif
+
+- /*
+-Description: Setting environment LANG=C to circumvent libgcj10 exception with locale de_AT.UTF-8
+- This patch is a workaround to an ArrayIndexOutOfBoundsException
+- evoked in java.text.SimpleDateFormat.formatWithAttribute (libgcj10, Version 4.4.2-4)
+- The exception occures only between April and December and with the de_AT-UTF.8 locale.
+-Author: Johann Felix Soden <johfel at gmx.de>
+-Bug-Debian: http://bugs.debian.org/560594
+- */
+- static char my_lang[]="LANG=C";
+- putenv(my_lang);
+-
+ for( int ii= 1; ii< argc; ++ii ) {
+ version_b=
+ (version_b ||
diff --git a/pdftk.spec b/pdftk.spec
index 034936f..c64a095 100644
--- a/pdftk.spec
+++ b/pdftk.spec
@@ -3,17 +3,18 @@
Summary: The PDF Tool Kit
Name: pdftk
Version: 1.44
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2+
URL: http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
Source0: http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/%{name}-%{version}-src.zip
Patch0: pdftk-use-internal-itext.patch
# Solves ".afm files not found" error. RHBZ#494785:
-Patch4: pdftk-classpath.patch
+Patch1: pdftk-classpath.patch
+Patch2: pdftk-1.44-gcjfix.patch
Group: Applications/Publishing
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-java
-BuildRequires: libgcj-devel
+# Solves #712013 wjocj requires gcc 4.7.0-2 as minimum
+BuildRequires: gcc-java >= 4.7.0-2
+BuildRequires: libgcj-devel >= 4.7.0-2
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: itext >= %{itextvers}
@@ -47,7 +48,8 @@ C++ code to use iText's (itext-paulo) Java classes.
%prep
%setup -q -n %{name}-%{version}-dist
%patch0 -p1
-%patch4 -p0 -b .classpath
+%patch1 -p0 -b .classpath
+%patch2 -p1 -b .gcjfix
# Remove bundled libraries from the source tree
rm -rf java
@@ -69,15 +71,11 @@ jar tf %{_javadir}/itext-%{itextvers}.jar | grep '\.class$' | sed 's/\.class//'
make -f Makefile.Redhat LIBDIR=%{_libdir} %{?_smp_mflags} ITEXTVERS="%{itextvers}"
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
install -m 0755 pdftk/pdftk $RPM_BUILD_ROOT/%{_bindir}/pdftk
install -m 0644 pdftk.1 $RPM_BUILD_ROOT/%{_mandir}/man1/pdftk.1
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
%doc changelog.html changelog.notes changelog.txt
@@ -87,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/%{name}*
%changelog
+* Thu Apr 19 2012 Jochen Schmitt <Jochen herr-schmitt de> 1.44-9
+- Remove workarout for #712013 (Requires gcc 4.7.0-1 as minimum)
+- Package cleanup
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.44-8
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list