Changeset d79635c


Ignore:
Timestamp:
07/16/11 11:42:45 (2 years ago)
Author:
Aurélien Bompard <aurelien@…>
Branches:
master
Parents:
11ac809 (diff), 7db319e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Aurélien Bompard <aurelien@…> (07/16/11 11:42:45)
git-committer:
Aurélien Bompard <aurelien@…> (07/16/11 11:42:45)
Message:

Merge branch 'master' of ​git://gitorious.org/xhtml2odt/xhtml2odt

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • NEWS.txt

    r56b06fd r7cb2180  
    99* Add RPM and Debian package metadata 
    1010* Better XML escaping in the PHP script 
    11 * Add support for Elyxer 
     11* Add support for Lyx and Elyxer 
    1212* Other various improvements and bug fixes 
    1313 

  • debian/control

    rac04f21 r7db319e  
    33Priority: extra 
    44Maintainer: Aurélien Bompard <aurelien@bompard.org> 
    5 Build-Depends: debhelper (>= 7), python-nose, python-utidylib, python-lxml, python-imaging, python-sphinx, tofrodos 
     5Build-Depends: debhelper (>= 7), python-nose, python-utidylib, python-lxml, python-imaging, python-sphinx, tofrodos, help2man 
    66Standards-Version: 3.7.3 
    77Homepage: http://xhtml2odt.org 
    … …  
    1313 XHTML2ODT is a converting library from XHTML to ODT. It is based on XSL 
    1414 style sheets for portability, and is designed to help web applications export 
    15  to the ODT document format.  
     15 to the ODT document format. 

  • xhtml2odt.spec

    r4ee9377 r7db319e  
     1%define python_tidy python-tidy 
     2%define phpdoc phpdoc 
     3%if 0%{?mandriva_version} 
     4%define python_tidy python-uTidylib 
     5%define phpdoc php-pear-PhpDocumentor 
     6%endif 
     7%if 0%{?suse_version} 
     8%define python_tidy python-utidy 
     9%define phpdoc php5-pear-phpdocumentor 
     10%endif 
     11 
    112Name:           xhtml2odt 
    213Version:        1.3 
    … …  
    1526BuildRequires:  python-lxml 
    1627BuildRequires:  python-imaging 
    17 %if 0%{?mandriva_version} 
    18 BuildRequires:  python-uTidylib 
    19 %else 
    20 %if 0%{?suse_version} 
    21 BuildRequires:  python-utidy 
    22 %else 
    23 BuildRequires:  python-tidy 
    24 %endif 
    25 %endif 
     28BuildRequires:  %{python_tidy} 
    2629## Documentation 
    2730BuildRequires:  python-sphinx 
    28 %if 0%{?mandriva_version} 
    29 BuildRequires:  php-pear-PhpDocumentor 
     31%if 0%{?mandriva_version}%{?suse_version} 
     32# Can't make it work in OBS for now 
    3033%else 
    31 BuildRequires:  phpdoc 
     34BuildRequires:  %{phpdoc} 
    3235%endif 
    3336BuildRequires:  dos2unix 
     37BuildRequires:  help2man 
    3438 
    3539## Python script 
    36 %if 0%{?mandriva_version} 
    37 BuildRequires:  python-uTidylib 
    38 %else 
    39 %if 0%{?suse_version} 
    40 BuildRequires:  python-utidy 
    41 %else 
    42 Requires:       python-tidy 
    43 %endif 
    44 %endif 
     40Requires:       %{python_tidy} 
    4541Requires:       python-lxml 
    4642Requires:       python-imaging 
    … …  
    6056 
    6157%build 
    62 make doc 
     58make doc || : 
    6359rm -rf doc-python 
    6460mv doc-py/_build/html doc-python 
    … …  
    8884%defattr(-,root,root,-) 
    8985%doc *.txt doc-python example-scripts 
     86%if 0%{?mandriva_version}%{?suse_version} 
     87# Can't make it work in OBS for now 
     88%else 
    9089%doc doc-php 
     90%endif 
    9191%{_bindir}/* 
    9292%{_datadir}/%{name} 
Note: See TracChangeset for help on using the changeset viewer.