[liblouisutdml/f14] added missing runtime dependency; fixed call of wrong executable in helper scripts

[Martin Gieseking]

commit 1ee00b10092c4c09f81c25c476995d5f7e278247
Author: Martin Gieseking <martin.gieseking at uos.de>
Date:   Fri May 20 16:13:52 2011 +0200

    added missing runtime dependency; fixed call of wrong executable in helper scripts

 liblouisutdml-1.9.0-xml2brl.patch |   28 ++++++++++++++++++++++++++++
 liblouisutdml.spec                |   18 ++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
---
diff --git a/liblouisutdml-1.9.0-xml2brl.patch b/liblouisutdml-1.9.0-xml2brl.patch
new file mode 100644
index 0000000..aa792f5
--- /dev/null
+++ b/liblouisutdml-1.9.0-xml2brl.patch
@@ -0,0 +1,28 @@
+diff --git a/tools/msword2brl.in b/tools/msword2brl.in
+--- a/tools/msword2brl.in
++++ b/tools/msword2brl.in
+@@ -44,5 +44,5 @@
+   esac
+ done
+ 
+-antiword -x db $1 | xml2brl >$2
++antiword -x db $1 | file2brl >$2
+ 
+diff --git a/tools/pdf2brl.in b/tools/pdf2brl.in
+--- a/tools/pdf2brl.in
++++ b/tools/pdf2brl.in
+@@ -45,4 +45,4 @@
+   esac
+ done
+ 
+-pdftotext -raw $1 - |xml2brl -p >$2
++pdftotext -raw $1 - |file2brl -p >$2
+diff --git a/tools/rtf2brl.in b/tools/rtf2brl.in
+--- a/tools/rtf2brl.in
++++ b/tools/rtf2brl.in
+@@ -44,4 +44,4 @@
+   esac
+ done
+ 
+-rtf2xml $1 |xml2brl >$2
++rtf2xml $1 |file2brl >$2
diff --git a/liblouisutdml.spec b/liblouisutdml.spec
index 37a5097..043fde4 100644
--- a/liblouisutdml.spec
+++ b/liblouisutdml.spec
@@ -1,12 +1,16 @@
 Name:           liblouisutdml
 Version:        1.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Braille transcription library for UTDML documents
 Group:          System Environment/Libraries
 License:        LGPLv3+
 URL:            http://abilitiessoft.com
 Source0:        http://abilitiessoft.com/%{name}-%{version}.tar.gz
 
+# replace calls to xml2brl with file2brl
+# http://code.google.com/p/liblouisutdml/issues/detail?id=2
+Patch0:         %{name}-%{version}-xml2brl.patch
+
 BuildRequires:  ant
 BuildRequires:  help2man
 BuildRequires:  java-devel >= 1:1.6.0
@@ -45,6 +49,7 @@ Summary: Utilities that convert various file formats into braille
 Group: Applications/Text
 License: GPLv3+
 Requires: antiword
+Requires: poppler-utils
 
 %description utils
 This package provides the following command-line utilities to convert from 
@@ -87,6 +92,7 @@ provided by %{name}-utils.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -105,9 +111,12 @@ ant
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}/%{_infodir}/dir
 rm -f %{buildroot}/%{_libdir}/liblouisutdml.la
-rm -f %{buildroot}/%{_bindir}/lbx_devonly
 rm -rf %{buildroot}/%{_defaultdocdir}/liblouisutdml
 
+# remove rtf2brl as the required dependency rtf2xml is not available in Fedora
+rm -f %{buildroot}/%{_bindir}/rtf2brl
+rm -f %{buildroot}/%{_mandir}/man1/rtf2brl.1
+
 install -d %{buildroot}%{_javadir}
 install -D -p java/j%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 ln -s %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/j%{name}.jar
@@ -161,6 +170,11 @@ fi
 
 
 %changelog
+* Fri May 20 2011 Martin Gieseking <martin.gieseking at uos.de> 1.9.0-2
+- Added missing Requires: poppler-utils to -utils package.
+- Replaced xml2brl calls with file2brl in helper scripts.
+- Dropped rtf2brl because required dependency rtf2xml is not yet available in Fedora.
+
 * Fri May 20 2011 Martin Gieseking <martin.gieseking at uos.de> 1.9.0-1
 - Updated to release 1.9.0.