Hello community, here is the log from the commit of package dblatex for openSUSE:Factory checked in at 2017-08-10 14:05:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dblatex (Old) and /work/SRC/openSUSE:Factory/.dblatex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dblatex" Thu Aug 10 14:05:15 2017 rev:22 rq:514483 version:0.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/dblatex/dblatex.changes 2016-05-03 10:17:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dblatex.new/dblatex.changes 2017-08-10 14:13:02.140575634 +0200 @@ -1,0 +2,13 @@ +Thu Aug 3 20:54:27 UTC 2017 - [email protected] + +- Cleanup spec file with spec cleaner +- Simplify conditionals +- Drop dblatex-rpmlintrc + +------------------------------------------------------------------- +Thu Aug 3 16:50:25 CEST 2017 - [email protected] + +- Fix texlive-multirow incompatibility (boo#1052102, debian#840189, + dblatex-xmultirow.patch). + +------------------------------------------------------------------- Old: ---- dblatex-rpmlintrc New: ---- dblatex-xmultirow.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dblatex.spec ++++++ --- /var/tmp/diff_new_pack.ExmBvB/_old 2017-08-10 14:13:02.692497922 +0200 +++ /var/tmp/diff_new_pack.ExmBvB/_new 2017-08-10 14:13:02.696497359 +0200 @@ -1,7 +1,7 @@ # # spec file for package dblatex # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,33 +19,65 @@ Name: dblatex Version: 0.3.7 Release: 0 +Summary: DocBook to LaTeX Publishing +License: GPL-2.0 +Group: Productivity/Publishing/DocBook +Url: http://dblatex.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Source1: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +#PATCH-FIX-OPENSUSE dblatex-0.3.4-disable-debian.patch [email protected] -disables debian specific installation parts +Patch0: dblatex-0.3.4-disable-debian.patch +# PATCH-FIX-DEBIAN dblatex-xmultirow.patch boo1052102 debian840189 [email protected] -- Fix texlive-multirow incompatibility. +Patch1: dblatex-xmultirow.patch BuildRequires: ImageMagick -BuildRequires: dos2unix +BuildRequires: fdupes BuildRequires: grep BuildRequires: libxslt BuildRequires: python-devel BuildRequires: pyxml +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-epstopdf +BuildRequires: texlive-latex BuildRequires: transfig -Requires: pyxml -Summary: DocBook to LaTeX Publishing -License: GPL-2.0 -Group: Productivity/Publishing/DocBook -Url: http://dblatex.sourceforge.net +BuildRequires: tex(amsmath.sty) +BuildRequires: tex(amssymb.sty) +BuildRequires: tex(anysize.sty) +BuildRequires: tex(appendix.sty) +BuildRequires: tex(attachfile.sty) +BuildRequires: tex(bibtopic.sty) +BuildRequires: tex(calc.sty) +BuildRequires: tex(changebar.sty) +BuildRequires: tex(cmap.sty) +BuildRequires: tex(color.sty) +BuildRequires: tex(colortbl.sty) +BuildRequires: tex(courier.sty) +BuildRequires: tex(dummyels.sty) +BuildRequires: tex(enumitem.sty) +BuildRequires: tex(fancybox.sty) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(fancyvrb.sty) +BuildRequires: tex(float.sty) +BuildRequires: tex(fontenc.sty) +BuildRequires: tex(fontspec.sty) +BuildRequires: tex(footmisc.sty) +BuildRequires: tex(hyperref.sty) +BuildRequires: tex(ifpdf.sty) +BuildRequires: tex(ifxetex.sty) +BuildRequires: tex(lastpage.sty) +BuildRequires: tex(listings.sty) +BuildRequires: tex(mathrsfs.sty) +BuildRequires: tex(multirow.sty) +BuildRequires: tex(overpic.sty) +BuildRequires: tex(pdfpages.sty) +BuildRequires: tex(ragged2e.sty) +BuildRequires: tex(rotating.sty) +BuildRequires: tex(stmaryrd.sty) +BuildRequires: tex(subfigure.sty) +BuildRequires: tex(titlesec.sty) +BuildRequires: tex(wasysym.sty) +BuildRequires: tex(xecyr.sty) +BuildRequires: tex(xltxtra.sty) Requires: docbook_4 -#PATCH-FIX-OPENSUSE dblatex-0.3.4-disable-debian.patch [email protected] -disables debian specific installation parts -Patch0: dblatex-0.3.4-disable-debian.patch -%if %suse_version <= 1220 -Requires: texlive -Requires: texlive-bin -Requires: texlive-latex -BuildRequires: texlive -BuildRequires: texlive-bin -BuildRequires: texlive-latex -%else +Requires: pyxml Requires: texlive-collection-fontsrecommended Requires: texlive-epstopdf Requires: texlive-latex @@ -89,61 +121,18 @@ Requires: tex(wasysym.sty) Requires: tex(xecyr.sty) Requires: tex(xltxtra.sty) -BuildRequires: texlive-collection-fontsrecommended -BuildRequires: texlive-epstopdf -BuildRequires: texlive-latex -BuildRequires: tex(amsmath.sty) -BuildRequires: tex(amssymb.sty) -BuildRequires: tex(anysize.sty) -BuildRequires: tex(appendix.sty) -BuildRequires: tex(attachfile.sty) -BuildRequires: tex(bibtopic.sty) -BuildRequires: tex(calc.sty) -BuildRequires: tex(changebar.sty) -BuildRequires: tex(cmap.sty) -BuildRequires: tex(color.sty) -BuildRequires: tex(colortbl.sty) -BuildRequires: tex(courier.sty) -BuildRequires: tex(dummyels.sty) -BuildRequires: tex(enumitem.sty) -BuildRequires: tex(fancybox.sty) -BuildRequires: tex(fancyhdr.sty) -BuildRequires: tex(fancyvrb.sty) -BuildRequires: tex(float.sty) -BuildRequires: tex(fontenc.sty) -BuildRequires: tex(fontspec.sty) -BuildRequires: tex(footmisc.sty) -BuildRequires: tex(hyperref.sty) -BuildRequires: tex(ifpdf.sty) -BuildRequires: tex(ifxetex.sty) -BuildRequires: tex(lastpage.sty) -BuildRequires: tex(listings.sty) -BuildRequires: tex(mathrsfs.sty) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(overpic.sty) -BuildRequires: tex(pdfpages.sty) -BuildRequires: tex(ragged2e.sty) -BuildRequires: tex(rotating.sty) -BuildRequires: tex(stmaryrd.sty) -BuildRequires: tex(subfigure.sty) -BuildRequires: tex(titlesec.sty) -BuildRequires: tex(wasysym.sty) -BuildRequires: tex(xecyr.sty) -BuildRequires: tex(xltxtra.sty) -%endif +BuildArch: noarch %py_requires %description -dblatex is a program that transforms your SGML/XMLDocBook -documents to DVI, PostScript or PDF by translating them -into pure LaTeX as a first process. MathML 2.0 markups -are supported, too. It started as a clone of DB2LaTeX. +dblatex is a program that transforms your SGML/XMLDocBook documents to DVI, +PostScript or PDF by translating them into pure LaTeX as a first process. +MathML 2.0 markups are supported, too. It started as a clone of DB2LaTeX. %prep %setup -q -%__cp docs/manual.pdf . - %patch0 -p1 +%patch1 -p1 # correct doc paths in setup sed -i 's/share\/doc\/dblatex/share\/doc\/packages\/dblatex/g' setup.py @@ -153,20 +142,17 @@ lib/dbtexmf/dblatex/xetex/fsconfig.py %build -env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +python setup.py build %install -%{__python} setup.py install \ - --prefix=%{_prefix} \ - --root=$RPM_BUILD_ROOT \ - --record-rpm=INSTALLED_FILES - -[ -e %{py_sitedir}/dbtexmf/dblatex/xetex/fontspec.py ] && \ - dos2unix %{py_sitedir}/dbtexmf/dblatex/xetex/fontspec.py -%{__grep} -v -e '%dir %{_defaultdocdir}$' INSTALLED_FILES > _tmp -%{__mv} _tmp INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%fdupes %{buildroot} -%files -f INSTALLED_FILES -%defattr(-,root,root) +%files +%{_docdir}/dblatex +%{_bindir}/dblatex +%{_datadir}/dblatex +%{python_sitelib}/* +%{_mandir}/man1/dblatex.1%{ext_man} %changelog ++++++ dblatex-xmultirow.patch ++++++ Author: Andreas Hoenen <[email protected]> Description: hotfix for BTS report #840189: Adapt to signature change of \@xmultirow macro (between texlive-latex-extra versions 2016.20160819-1 and 2016.20161008-1). --- a/latex/style/dbk_table.sty +++ b/latex/style/dbk_table.sty @@ -24,12 +24,13 @@ % Make \@xmultirow long \expandafter\long\expandafter\def% \expandafter\@xmultirow% -\expandafter#\expandafter1% -\expandafter[\expandafter#\expandafter2\expandafter]% -\expandafter#\expandafter3% -\expandafter[\expandafter#\expandafter4\expandafter]% -\expandafter#\expandafter5% -\expandafter{\@xmultirow{#1}[#2]{#3}[#4]{#5}} +\expandafter[\expandafter#\expandafter1\expandafter]% +\expandafter#\expandafter2% +\expandafter[\expandafter#\expandafter3\expandafter]% +\expandafter#\expandafter4% +\expandafter[\expandafter#\expandafter5\expandafter]% +\expandafter#\expandafter6% +\expandafter{\@xmultirow[#1]{#2}[#3]{#4}[#5]{#6}} % For the newtbl code \newdimen\newtblstarfactor%
