diff --git a/pdftk-1.41-stdin.patch b/pdftk-1.41-stdin.patch deleted file mode 100644 index f77fe0a..0000000 --- a/pdftk-1.41-stdin.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up pdftk-1.41/pdftk/pdftk.cc.org pdftk-1.41/pdftk/pdftk.cc ---- pdftk-1.41/pdftk/pdftk.cc.org 2009-03-31 17:22:27.000000000 +0200 -+++ pdftk-1.41/pdftk/pdftk.cc 2009-03-31 17:27:21.000000000 +0200 -@@ -586,7 +586,10 @@ TK_Session::dump_session_data() const - for( vector< InputPdf >::const_iterator it= m_input_pdf.begin(); - it!= m_input_pdf.end(); ++it ) - { -- cout << " " << it->m_filename; -+ if(it->m_filename == "/dev/stdin") -+ cout << " "; -+ else -+ cout << " " << it->m_filename; - if( !it->m_password.empty() ) { - cout << ", " << it->m_password; - } -@@ -976,6 +979,8 @@ TK_Session::TK_Session( int argc, - - InputPdf input_pdf; - input_pdf.m_filename= argv[ii]; -+ if(input_pdf.m_filename == "-") -+ input_pdf.m_filename = "/dev/stdin"; - m_input_pdf.push_back( input_pdf ); - } - else { // use given handle for filename; test, first diff --git a/pdftk.spec b/pdftk.spec index d3f1484..e4e7ed7 100644 --- a/pdftk.spec +++ b/pdftk.spec @@ -3,7 +3,7 @@ Summary: The PDF Tool Kit Name: pdftk Version: 1.41 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ URL: http://www.pdfhacks.com/pdftk/ # Remove java-lib/com because it's contains licensing issue @@ -11,7 +11,6 @@ Source0: http://www.pdfhacks.com/pdftk/%{name}-%{version}-noitext.tar.bz2 Patch0: pdftk-use-internal-itext.patch Patch1: pdftk-1.41-make.patch Patch2: pdftk-1.41-gcc44.patch -Patch3: pdftk-1.41-stdin.patch # Solves ".afm files not found" error. RHBZ#494785: Patch4: pdftk-classpath.patch Group: Applications/Publishing @@ -20,9 +19,10 @@ BuildRequires: gcc-java BuildRequires: libgcj-devel BuildRequires: java-devel >= 1:1.6.0 -# Requires itext-2.1.4-3 BuildRequires: itext >= %{itextvers} +Requires: itext >= 2.1.5-2 + %description If PDF is electronic paper, then pdftk is an electronic staple-remover, hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a simple @@ -47,7 +47,6 @@ C++ code to use iText's (itext-paulo) Java classes. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -b .org %patch4 -p0 -b .classpath rm -rf java_libs @@ -90,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Tue Apr 21 2009 Jochen Schmitt 1.41-16 +- Remove stdin patch, add Req. to modified iText release (BZ #495574) + * Wed Apr 8 2009 Orcan Ogetbil 1.41-15 - Patch ".afm files not found" issue (#494785)