1.1 --- a/xmlto/xmlto.spec Fri Aug 10 14:59:30 2012 +0200 1.2 +++ b/xmlto/xmlto.spec Fri Aug 10 15:00:17 2012 +0200 1.3 @@ -31,21 +31,17 @@ 1.4 Class: EVAL 1.5 Group: XML 1.6 License: GPL 1.7 -Version: 0.0.20 1.8 -Release: 20100105 1.9 +Version: 0.0.25 1.10 +Release: 20120800 1.11 1.12 # list of sources 1.13 -Source0: http://cyberelk.net/tim/data/xmlto/stable/xmlto-%{version}.tar.bz2 1.14 +Source0: http://fedorahosted.org/releases/x/m/xmlto/xmlto-%{version}.tar.bz2 1.15 1.16 # build information 1.17 -Prefix: %{l_prefix} 1.18 -BuildRoot: %{l_buildroot} 1.19 -BuildPreReq: OpenPKG, openpkg >= 20040130 1.20 -PreReq: OpenPKG, openpkg >= 20040130 1.21 +BuildPreReq: OpenPKG, openpkg >= 20100101, make 1.22 +PreReq: OpenPKG, openpkg >= 20100101 1.23 BuildPreReq: libxml, libxslt, tetex, docbook, getopt, mktemp 1.24 PreReq: libxml, libxslt, tetex, docbook, getopt, mktemp 1.25 -AutoReq: no 1.26 -AutoReqProv: no 1.27 1.28 %description 1.29 xmlto converts an XML input format (DocBook or XSL-FO) into a 1.30 @@ -63,17 +59,8 @@ 1.31 %prep 1.32 %setup -q 1.33 %{l_shtool} subst \ 1.34 - -e 's;/bin/bash;@BASH@;g' \ 1.35 - xmlto.in 1.36 - %{l_shtool} subst \ 1.37 - -e 's;/usr/bin/\([a-z0-9\-\.]*\);`which \1`;g' \ 1.38 - format/docbook/txt 1.39 - %{l_shtool} subst \ 1.40 -e 's;sh \("\$(dirname "\$0")\);%{l_bash} \1;g' \ 1.41 format/docbook/dvi format/docbook/pdf format/docbook/ps 1.42 - %{l_shtool} subst \ 1.43 - -e 's;bash ;$(BASH) ;g' \ 1.44 - Makefile.in 1.45 1.46 %build 1.47 CC="%{l_cc}" \ 1.48 @@ -82,14 +69,10 @@ 1.49 LDFLAGS="%{l_ldflags}" \ 1.50 ./configure \ 1.51 --prefix=%{l_prefix} \ 1.52 - --mandir=%{l_prefix}/man \ 1.53 - --with-bash=%{l_bash} \ 1.54 - --with-getopt=%{l_prefix}/bin/getopt \ 1.55 - --with-mktemp=%{l_prefix}/bin/mktemp 1.56 + --mandir=%{l_prefix}/man 1.57 %{l_make} %{l_mflags -O} 1.58 1.59 %install 1.60 - rm -rf $RPM_BUILD_ROOT 1.61 %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 1.62 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true 1.63 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 1.64 @@ -97,5 +80,4 @@ 1.65 %files -f files 1.66 1.67 %clean 1.68 - rm -rf $RPM_BUILD_ROOT 1.69