diff --git a/.gitignore b/.gitignore index cb7c105..b1e1109 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -dblatex-0.3.tar.bz2 +/dblatex-0.3.4.tar.bz2 diff --git a/dblatex-disable-debian.patch b/dblatex-disable-debian.patch new file mode 100644 index 0000000..d2b2b05 --- /dev/null +++ b/dblatex-disable-debian.patch @@ -0,0 +1,26 @@ +--- dblatex-0.3.4/setup.py 2012-06-02 16:43:42.000000000 -0700 ++++ dblatex-0.3.4/setup.py_disable_debian 2012-12-03 21:30:30.843851029 -0800 +@@ -23,7 +23,7 @@ from distutils.command.sdist import sdis + from distutils import log + from subprocess import Popen, PIPE + sys.path.append("lib") +-from contrib.debian.installer import DebianInstaller ++#from contrib.debian.installer import DebianInstaller + + # + # Build the command line script +@@ -365,10 +365,10 @@ class Install(install): + raise OSError("not found: %s" % ", ".join(mis_stys)) + + def run(self): +- if self.install_layout == "deb": +- db = DebianInstaller(self) +- else: +- db = None ++# if self.install_layout == "deb": ++# db = DebianInstaller(self) ++# else: ++ db = None + + if not(db) and not(self.nodeps): + try: diff --git a/dblatex.spec b/dblatex.spec index b7ba7ba..3cd49c4 100644 --- a/dblatex.spec +++ b/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.3 -Release: 5%{?dist} +Version: 0.3.4 +Release: 4%{?dist} Summary: DocBook to LaTeX/ConTeXt Publishing BuildArch: noarch Group: Applications/Publishing @@ -12,16 +12,52 @@ 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-disable-debian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: python-which BuildRequires: libxslt BuildRequires: ImageMagick -BuildRequires: tex(latex) -BuildRequires: tex(xetex) -Requires: tex(xetex) -Requires: libxslt docbook-dtds passivetex ImageMagick transfig +BuildRequires: texlive-base +BuildRequires: texlive-collection-latex +BuildRequires: texlive-collection-xetex +BuildRequires: texlive-collection-htmlxml +BuildRequires: transfig +BuildRequires: texlive-epstopdf-bin +BuildRequires: texlive-xmltex-bin +BuildRequires: texlive-anysize +BuildRequires: texlive-appendix +BuildRequires: texlive-changebar +BuildRequires: texlive-jknapltx +BuildRequires: texlive-multirow +BuildRequires: texlive-overpic +BuildRequires: texlive-pdfpages +BuildRequires: texlive-subfigure +BuildRequires: texlive-stmaryrd +Requires: texlive-base +Requires: texlive-collection-latex +Requires: texlive-collection-xetex +Requires: texlive-collection-htmlxml +Requires: texlive-collection-fontsrecommended +Requires: texlive-epstopdf-bin +Requires: texlive-passivetex +Requires: texlive-xmltex texlive-xmltex-bin +Requires: texlive-anysize +Requires: texlive-appendix +Requires: texlive-bibtopic +Requires: texlive-changebar +Requires: texlive-ec +Requires: texlive-jknapltx +Requires: texlive-overpic +Requires: texlive-passivetex +Requires: texlive-pdfpages +Requires: texlive-subfigure +Requires: texlive-stmaryrd +Requires: texlive-xmltex-bin +Requires: libxslt docbook-dtds +Requires: transfig +Requires: ImageMagick %description dblatex is a program that transforms your SGML/XMLDocBook @@ -38,10 +74,11 @@ Authors: %prep %setup -q %patch0 -p1 -b .external-which +%patch1 -p1 -b .disable-debian rm -rf lib/contrib %build -%{__python } setup.py build +%{__python} setup.py build %install @@ -53,14 +90,14 @@ for file in bibtopic.sty enumitem.sty ragged2e.sty passivetex/ xelatex/; do rm -rf $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/misc/$file done -mkdir -p $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/dblatex +mkdir -p $RPM_BUILD_ROOT%{_datadir}/texlive/texmf-dist/tex/latex/dblatex for file in ` find $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/ -name '*.sty' ` ; do - mv $file $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/dblatex/`basename $file`; + mv $file $RPM_BUILD_ROOT%{_datadir}/texlive/texmf-dist/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`; + mv $file $RPM_BUILD_ROOT%{_datadir}/texlive/texmf-dist/tex/latex/dblatex/`basename $file`; done rmdir $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/{misc,contrib/example,style} @@ -86,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/dblatex-*.egg-info %{_bindir}/dblatex %{_datadir}/dblatex/ -%{_datadir}/texmf/tex/latex/dblatex/ +%{_datadir}/texlive/texmf-dist/tex/latex/dblatex/ %dir %{_sysconfdir}/dblatex %post -p /usr/bin/texhash @@ -94,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT %postun -p /usr/bin/texhash %changelog +* Wed Jan 02 2013 Benjamin De Kosnik - 0.3.4-1 +- Update to 0.3.4. +- Adjust for texlive rebase. + * Wed Jul 18 2012 Fedora Release Engineering - 0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 95cf315..bcc58ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7de6bf72b8b2934169ce0ec911e966ed dblatex-0.3.tar.bz2 +a511a2eaa55757b341e4c46353c5c681 dblatex-0.3.4.tar.bz2