update docs building/packaging

diff --git a/translate-toolkit.spec b/translate-toolkit.spec
index d7bb7ae1c12b30f4cb0cb5ff0fd20c76bae13b75..5439401d6d6adc00329b9260117e0bc95885aa04 100644 (file)
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@ -6,7 +6,7 @@
 Summary:       Tools to assist with translation and software localization
 Name:          translate-toolkit
 Version:       1.13.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       https://github.com/translate/translate/releases/download/%{version}/%{name}-%{version}.tar.bz2
@@ -19,13 +19,13 @@ BuildRequires:      checkbashisms
 BuildRequires: python-dateutil
 BuildRequires: python-modules
 BuildRequires: rpm-pythonprov
-BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: sed >= 4.0
-# The following are needed for man page generation
+%if %{with doc}
 BuildRequires: python-lxml
 BuildRequires: python-simplejson
 BuildRequires: python-vobject
+%endif
 Requires:      python-iniparse >= 0.3.1
 Requires:      python-lxml >= 2.1.0
 Requires:      python-simplejson
@@ -94,16 +94,28 @@ for script in build-2/scripts-%{py_ver}/*; do
        program=${script##*/}
 
        # exclude some known failures
-       case $script in
-               build_firefox.sh|buildxpi.py|get_moz_enUS.py|\
-               pocompendium|poen|pomigrate2|popuretext|poreencode|posplit|pocount|poglossary|lookupclient.py|tmserver|build_tmdb)
-       ;;
-       *)
-               LC_ALL=C PYTHONPATH=. $program --manpage \
-                 > man/$program.1 \
-                 || %{__rm} man/$program.1
-       ;;
+       case $program in
+               build_firefox.sh|\
+               build_tmdb|\
+               buildxpi.py|\
+               get_moz_enUS.py|\
+               junitmsgfmt|\
+               pocommentclean|\
+               pocompendium|\
+               pocount|\
+               pomigrate2|\
+               popuretext|\
+               poreencode|\
+               posplit|\
+               tmserver|\
+               ...)
+               continue
+               ;;
        esac
+
+       LC_ALL=C PYTHONPATH=. $script --manpage > man/$program.1
+       # if this grep fails, you should exclude it above
+       grep 'Autogenerated manpage' man/$program.1
 done
 
 %install
@@ -230,7 +242,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ical2po.1*
 %{_mandir}/man1/ini2po.1*
 %{_mandir}/man1/json2po.1*
-%{_mandir}/man1/junitmsgfmt.1*
 %{_mandir}/man1/moz2po.1*
 %{_mandir}/man1/odf2xliff.1*
 %{_mandir}/man1/oo2po.1*
@@ -246,6 +257,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/po2php.1*
 %{_mandir}/man1/po2prop.1*
 %{_mandir}/man1/po2rc.1*
+%{_mandir}/man1/po2resx.1*
 %{_mandir}/man1/po2sub.1*
 %{_mandir}/man1/po2symb.1*
 %{_mandir}/man1/po2tiki.1*
@@ -270,6 +282,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pretranslate.1*
 %{_mandir}/man1/prop2po.1*
 %{_mandir}/man1/rc2po.1*
+%{_mandir}/man1/resx2po.1*
 %{_mandir}/man1/sub2po.1*
 %{_mandir}/man1/symb2po.1*
 %{_mandir}/man1/tiki2po.1*