- Update to latest upstream (0.2.9) (#448953)

- Remove some redundant Requires and BuildRequires (passivetex pulls in the
    tetex/tex requires, python dep added automatically)
- For F-9+ BR on tex(latex) and texlive-xetex, fix the installation scripts
    to install extra new files.
- Add patch from dblatex mailing list for better handling of a missing
    xetex.
- Conditionally add .egg-info file only if F9+ to allow for unified spec
    file

.cvsignore

@@ -1 +1 @@
-dblatex-0.2.8.tar.bz2
+dblatex-0.2.9.tar.bz2

dblatex-0.2.9-xetex.patch

@@ -0,0 +1,100 @@
+Index: setup.py
+===================================================================
+RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/setup.py,v
+retrieving revision 1.13
+diff -u -r1.13 setup.py
+--- setup.py	6 Nov 2007 22:28:57 -0000	1.13
++++ setup.py	4 Jun 2008 22:35:50 -0000
+@@ -259,7 +259,7 @@
+         used_stys.sort()
+ 
+         # Dirty...
+-        for f in ("truncate", "elfonts", "CJKutf8", "pinyin"):
++        for f in ("truncate", "elfonts", "CJKutf8", "pinyin", "ifxetex"):
+             try:
+                 used_stys.remove(f)
+             except:
+Index: latex/style/dbk_fonts.sty
+===================================================================
+RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/latex/style/dbk_fonts.sty,v
+retrieving revision 1.3
+diff -u -r1.3 dbk_fonts.sty
+--- latex/style/dbk_fonts.sty	18 Apr 2008 23:11:22 -0000	1.3
++++ latex/style/dbk_fonts.sty	4 Jun 2008 22:50:36 -0000
+@@ -1,4 +1,4 @@
+-\usepackage{ifxetex}
++
+ \ifxetex
+ % to have the \text macro
+ \usepackage{amstext}
+Index: latex/style/docbook.sty
+===================================================================
+RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/latex/style/docbook.sty,v
+retrieving revision 1.23
+diff -u -r1.23 docbook.sty
+--- latex/style/docbook.sty	3 Sep 2007 18:47:53 -0000	1.23
++++ latex/style/docbook.sty	31 May 2008 12:16:35 -0000
+@@ -8,12 +8,6 @@
+ \DeclareOption{hyperlink}{ \def\DBKhyperlink{yes} }
+ \DeclareOption{nohyperlink}{ \def\DBKhyperlink{no} }
+ 
+-\ifx\undefined\chapter
+-  \def\DBKisarticle{1}
+-\else
+-  \def\DBKisarticle{0}
+-\fi
+-
+ % Default values
+ \ExecuteOptions{nohyperlink}
+ 
+@@ -140,7 +134,7 @@
+ %% Inclusion of float package after hyperref to have its definitions!
+ \usepackage{float}
+ 
+-\if1\DBKisarticle
++\@ifundefined{chapter}{
+ 
+ \floatstyle{ruled}
+ \newfloat{example}{htb}{loe}[section]
+@@ -153,8 +147,7 @@
+ % Redefinition of tableofcontent, to have it in separate pages
+ \let\stdtoc=\tableofcontents
+ \def\tableofcontents{ \newpage \stdtoc{} \newpage} 
+-
+-\else
++}{
+ 
+ \floatstyle{ruled}
+ \newfloat{example}{htb}{loe}[chapter]
+@@ -163,8 +156,8 @@
+ \floatstyle{plain}
+ \newfloat{dbequation}{htb}{loe}[chapter]
+ \floatname{dbequation}{{\scshape Equation }}
++}
+ 
+-\fi
+ % Sidebar is a boxed minipage that can contain verbatim
+ \newenvironment{sidebar}[1][0.95\textwidth]{
+   \hspace{0mm}\newline%
+Index: xsl/lang.xsl
+===================================================================
+RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/xsl/lang.xsl,v
+retrieving revision 1.6
+diff -u -r1.6 lang.xsl
+--- xsl/lang.xsl	18 Apr 2008 23:11:31 -0000	1.6
++++ xsl/lang.xsl	4 Jun 2008 22:55:24 -0000
+@@ -192,7 +192,13 @@
+   </xsl:variable>
+ 
+   <!-- XeTeX preamble to handle fonts -->
+-  <xsl:text>\usepackage{ifxetex}&#10;</xsl:text>
++  <xsl:text>\IfFileExists{ifxetex.sty}{%
++    \usepackage{ifxetex}%
++  }{%
++    \newif\ifxetex
++    \xetexfalse
++  }
++  </xsl:text>
+   <xsl:text>\ifxetex&#10;</xsl:text>
+   <xsl:text>\usepackage{fontspec}&#10;</xsl:text>
+   <xsl:text>\usepackage{xltxtra}&#10;</xsl:text>

dblatex.spec

@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		dblatex
-Version:	0.2.8
-Release:	2%{?dist}.1
+Version:	0.2.9
+Release:	1%{?dist}
 Summary:	DocBook to LaTeX/ConTeXt Publishing
 BuildArch:	noarch
 Group:		Applications/Publishing
@@ -12,10 +12,22 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 #Source1:        http://docbook.sourceforge.net/release/xsl/current/COPYING
 Source1:        COPYING-docbook-xsl
 Patch0:		dblatex-0.2.7-external-which.patch
+Patch1:		dblatex-0.2.9-xetex.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	python-devel libxslt tetex ImageMagick tetex-latex python-which
-Requires:	tetex libxslt docbook-dtds python passivetex tetex-latex ImageMagick transfig tetex-fonts
+BuildRequires:  python-devel 
+BuildRequires:  python-which
+BuildRequires:  libxslt 
+BuildRequires:  ImageMagick 
+%if 0%{?fedora} < 9
+BuildRequires:  tetex-latex
+%else
+BuildRequires:  tex(latex)
+BuildRequires:  texlive-xetex
+Requires:       texlive-xetex
+%endif
+
+Requires:	libxslt docbook-dtds passivetex ImageMagick transfig
 
 %if 0%{?fedora} < 8
 Conflicts: tetex-tex4ht
@@ -36,6 +48,7 @@ Authors:
 %prep
 %setup -q
 %patch0 -p1 -b .external-which
+%patch1 -p0 -b .xetex
 rm -rf lib/contrib
 
 %build
@@ -47,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 #%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 # these are already in tetex-latex:
-for file in bibtopic.sty enumitem.sty ragged2e.sty passivetex/; do
+for file in bibtopic.sty enumitem.sty ragged2e.sty passivetex/ xelatex/; do
   rm -rf $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/misc/$file
 done
 
@@ -56,6 +69,11 @@ for file in ` find $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/ -name '*.sty' ` ; d
   mv $file $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/dblatex/`basename $file`;
 done
 
+## also move .xetex files
+for file in ` find $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/ -name '*.xetex' ` ; do 
+  mv $file $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/dblatex/`basename $file`;
+done
+
 rmdir $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/{misc,contrib/example,style}
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dblatex
@@ -76,7 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dblatex.1*
 %doc COPYRIGHT docs/manual.pdf COPYING-docbook-xsl README-xsltml
 %{python_sitelib}/dbtexmf/
+%if 0%{?fedora} >= 9
 %{python_sitelib}/dblatex-*.egg-info
+%endif
 %{_bindir}/dblatex
 %{_datadir}/dblatex/
 %{_datadir}/texmf/tex/latex/dblatex/
@@ -87,6 +107,17 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /usr/bin/texhash
 
 %changelog
+* Thu Jun 12 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.2.9-1
+- Update to latest upstream (0.2.9) (#448953)
+- Remove some redundant Requires and BuildRequires (passivetex pulls
+  in the tetex/tex requires, python dep added automatically)
+- For F-9+ BR on tex(latex) and texlive-xetex, fix the installation
+  scripts to install extra new files.
+- Add patch from dblatex mailing list for better handling of a missing
+  xetex.
+- Conditionally add .egg-info file only if F9+ to allow for unified
+  spec file
+
 * Sun Dec 16 2007 Patrice Dumas <pertusus@free.fr> - 0.2.8-2.1
 - don't install in docbook directory, it is a link to a versioned 
   directory and may break upon docbook update (#425251,#389231)

sources

@@ -1 +1 @@
-1bb57c3d63cd5ff7e02d4cd2cb53960f  dblatex-0.2.8.tar.bz2
+6ade2e1cbe40f1798cb8de846528bf43  dblatex-0.2.9.tar.bz2