- updated to 0.0.23

- removed obsolete no_which patch
- pass some paths for deterministic build

Changed files:
    xmlto-no_which.patch -> 1.2
    xmlto.spec -> 1.32

diff --git a/xmlto-no_which.patch b/xmlto-no_which.patch
deleted file mode 100644 (file)
index 93b1689..0000000
--- a/xmlto-no_which.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- xmlto-0.0.22/xmlto.in.orig 2009-03-24 15:54:31.000000000 +0100
-+++ xmlto-0.0.22/xmlto.in      2009-10-29 01:09:19.000000000 +0100
-@@ -124,7 +124,7 @@
- XSLTPROC_PATH=@XSLTPROC@
- 
- # Try to setup papersize using libpaper first ...
--if [ -n "`which "$PAPERCONF_PATH" 2>/dev/null`" ]
-+if [ -n "$PAPERCONF_PATH" ]
- then
-   papername=`"$PAPERCONF_PATH" -n`
-   paperheight=`"$PAPERCONF_PATH" -mh | sed 's/ //g'`
-@@ -155,7 +155,7 @@
-   fi
- 
- # ... or use magic paper size, based on LC_PAPER
--elif [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ]
-+elif [ -n "$LOCALE_PATH" ]
- then
-   # For paper sizes we know about, specify them.
-   h=$("$LOCALE_PATH" LC_PAPER 2>/dev/null | head -n 1)
-@@ -178,7 +178,7 @@
- fi
- 
- # Magic encoding, based on locale
--if [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ]
-+if [ -n "$LOCALE_PATH" ]
- then
-   charmap=$("$LOCALE_PATH" charmap 2>/dev/null)
- 
-@@ -227,14 +227,14 @@
- PDFXMLTEX_PATH=@PDFXMLTEX@
- 
- #check if we could use fop/dblatex backend as default(if not, use passivetex)
--if [ x"$USE_BACKEND" = xFOP ] && [ -z "`which "$FOP_PATH" 2>/dev/null`" ]
-+if [ x"$USE_BACKEND" = xFOP ] && [ -z "$FOP_PATH" ]
- then
-   echo >&2 "@PACKAGE@: Warning: fop not found or not executable."
-   echo >&2 "@PACKAGE@: Using default backend..."
-   USE_BACKEND=DEFAULT
- fi
- if [ x"$USE_BACKEND" = xDBLATEX ] && \
--   [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ]
-+   [ -z "$DBLATEX_PATH" ]
- then
-   echo >&2 "@PACKAGE@: Warning: dblatex not found or not executable."
-   echo >&2 "@PACKAGE@: Using default backend..."
-@@ -328,7 +328,7 @@
-       ;;
-   --with-fop)
-       ##use fop instead of passivetex where possible
--      if [ -z "`which "$FOP_PATH" 2>/dev/null`" ]
-+      if [ -z "$FOP_PATH" ]
-       then
-               echo >&2 Warning: fop not found or not executable.
-               echo >&2 Using default backend...
-@@ -339,7 +339,7 @@
-       ;;
-   --with-dblatex)
-       ##use dblatex instead of passivetex where possible
--      if [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ]
-+      if [ -z "$DBLATEX_PATH" ]
-       then
-               echo >&2 Warning: dblatex not found or not executable.
-               echo >&2 Using default backend...
-@@ -487,7 +487,7 @@
- if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$SOURCE_FORMAT" != "fo" ]
- then
-   #do we have xmllint validation tool?
--  if [ -z "`which "$XMLLINT_PATH" 2>/dev/null`" ]
-+  if [ -z "$XMLLINT_PATH" ]
-   then
-     echo >&2 "@PACKAGE@: xmllint validation tool not found or not executable."
-     echo >&2 "@PACKAGE@: Skipping validation... " \
-@@ -519,7 +519,7 @@
- else
- 
-   #do we have xsltproc tool?
--  if [ -z "`which "$XSLTPROC_PATH" 2>/dev/null`" ]
-+  if [ -z "$XSLTPROC_PATH" ]
-   then
-     echo >&2 "@PACKAGE@: Can't continue, xsltproc tool not found or not executable."
-     exit 3

diff --git a/xmlto.spec b/xmlto.spec
index 03eb4d1e3b77bd574a4fa9e873193d43d468909d..28a3cda901bdee7646f4c4088d2cc25a6730cd68 100644 (file)
--- a/xmlto.spec
+++ b/xmlto.spec
@@ -1,13 +1,12 @@
 Summary:       A tool for converting XML files to various formats
 Summary(pl.UTF-8):     Narzędzie do konwersji plików XML do różnych formatów
 Name:          xmlto
-Version:       0.0.22
-Release:       5
+Version:       0.0.23
+Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://fedorahosted.org/releases/x/m/xmlto/%{name}-%{version}.tar.bz2
-# Source0-md5: 12f297dc7051e4fef08339980f88a1dd
-Patch0:                %{name}-no_which.patch
+# Source0-md5: 3001d6bb2bbc2c8f6c2301f05120f074
 URL:           http://cyberelk.net/tim/software/xmlto/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.6
@@ -27,6 +26,7 @@ Requires:     util-linux
 # have dependency (written in Java, requires several Java libs, takes long time
 # to execute %post), so we don't want user to force to install it.
 Suggests:      fop
+# for paperconf program
 Suggests:      libpaper
 Obsoletes:     refentry2man
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,13 +41,16 @@ przy użyciu styli XSL.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       FOP=/usr/bin/fop \
+       PAPER_CONF=/usr/bin/paperconf \
+       PDFXMLTEX=/usr/bin/pdfxmltex \
+       XMLTEX=/usr/bin/xmltex
 %{__make}
 
 cat > refentry2man <<'EOF'
@@ -75,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/refentry2man
+%attr(755,root,root) %{_bindir}/xmlif
+%attr(755,root,root) %{_bindir}/xmlto
 %{_datadir}/%{name}
-%{_mandir}/man1/*
+%{_mandir}/man1/xmlif.1*
+%{_mandir}/man1/xmlto.1*