From 0946b3e986b1e8c46f5a3d4dc5e3102df122a5f700d521fb2768475c1302a8df Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 15 Jan 2010 01:29:35 +0000 Subject: [PATCH] Accepting request 29337 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-doc-utils via accept of submit request 29337 revision 4. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/29337 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-doc-utils?expand=0&rev=40 --- gnome-doc-utils-0.18.0.tar.bz2 | 3 -- gnome-doc-utils-0.19.2.tar.bz2 | 3 ++ gnome-doc-utils.changes | 54 +++++++++++++++++++++ gnome-doc-utils.spec | 86 ++++++++++++++++++---------------- 4 files changed, 103 insertions(+), 43 deletions(-) delete mode 100644 gnome-doc-utils-0.18.0.tar.bz2 create mode 100644 gnome-doc-utils-0.19.2.tar.bz2 diff --git a/gnome-doc-utils-0.18.0.tar.bz2 b/gnome-doc-utils-0.18.0.tar.bz2 deleted file mode 100644 index 2773b91..0000000 --- a/gnome-doc-utils-0.18.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:008d0037bb8c56a462267530008e833008188300ccf19c3cdcc76e8440fe67a4 -size 790422 diff --git a/gnome-doc-utils-0.19.2.tar.bz2 b/gnome-doc-utils-0.19.2.tar.bz2 new file mode 100644 index 0000000..202a62e --- /dev/null +++ b/gnome-doc-utils-0.19.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee5798361e4396269820aa7571bcf173e77c454ed2b1a38b9fc1dcbd7f58abae +size 854440 diff --git a/gnome-doc-utils.changes b/gnome-doc-utils.changes index d6ddc0a..f6738dc 100644 --- a/gnome-doc-utils.changes +++ b/gnome-doc-utils.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Tue Jan 12 01:33:01 CET 2010 - vuntz@opensuse.org + +- Update to version 0.19.2: + + Added 'css' command for Mallard documents + + Fixed theme.color.text default, was white-on-white + + Implemented previous and next links for Mallard documents + + Updated translations. + +------------------------------------------------------------------- +Wed Jan 6 11:29:08 CET 2010 - vuntz@opensuse.org + +- Update to version 0.19.1: + + Importing Mallard XSLT changes from yelp-xsl + - Added support for audio and video in Mallard HTML output + - Moved most automatic link logic into common XSLT + - Implemented sorting of link trails + - Implemented link groups on Mallard guide pages + - Added support for Mallard span element + - Added condensed list style for Mallard lists + - Made various parts of the Mallard XSLT more extensible + - Changed Mallard Cache files to use new namespace + + Added Mallard HTML output to gnome-doc-tool + + Added --custom-xslt option to gnome-doc-tool + + Compile mo files before running xml2po + + Properly clean mo files in build utilities + + Updated translations. +- Drop gnome-doc-utils-make-parallel.patch: fixed upstream. +- Make the build noarch. +- Remove en@shaw locale on 11.2 and earlier. +- Split xml2po tool in xml2po and xml2po-devel subpackages. +- Make gnome-doc-utils-devel Requires xml2po-devel, to make sure no + build is broken because of the split. + +------------------------------------------------------------------- +Wed Dec 2 16:18:08 CET 2009 - vuntz@opensuse.org + +- Update to version 0.18.1: + + Fixed Makefile.am to byte-compile Python files, bug #596702 + + Updated translations. +- Complete gnome-doc-utils-make-parallel.patch with commit + ce05d9fd, and reenable parallel build. + +------------------------------------------------------------------- +Thu Nov 26 08:45:55 CET 2009 - dimstar@opensuse.org + +- Parallel build still has chances to fail. Disabling for now. + +------------------------------------------------------------------- +Wed Nov 25 13:59:03 CET 2009 - dimstar@opensuse.org + +- Add gnome-doc-utils-make-parallel.patch to solve parallel build + failures (patch taken from upstream git). + ------------------------------------------------------------------- Mon Sep 28 17:08:42 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-doc-utils.spec b/gnome-doc-utils.spec index 5e6838e..5fec233 100644 --- a/gnome-doc-utils.spec +++ b/gnome-doc-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-doc-utils (Version 0.18.0) +# spec file for package gnome-doc-utils (Version 0.19.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,9 @@ Name: gnome-doc-utils -Version: 0.18.0 +Version: 0.19.2 Release: 1 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: A Collection of Documentation Utilities for GNOME Url: http://www.gnome.org Group: System/GUI/GNOME @@ -34,60 +34,60 @@ BuildRequires: pkg-config BuildRequires: python BuildRequires: translation-update-upstream Requires: %{name}-lang = %{version} -Requires: libxml2-python Requires: libxslt BuildRoot: %{_tmppath}/%{name}-%{version}-build -%py_requires +BuildArch: noarch %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} %endif %description The gnome-doc-utils package is a collection of documentation utilities -for the GNOMEproject. Notably, it contains utilities for building +for the GNOME project. Notably, it contains utilities for building documentation and all auxiliary files in your source tree. It also contains the DocBook XSLT stylesheets that were once distributed with -Yelp. Starting with GNOME 2.8, Yelp requires gnome-doc-utils for XSLT. -It also contains the Python program xml2po that extracts translatable -content from XML documents and outputs gettext-compatible POT files. -For simple tags, it works out-of-the-box. For complicated tags, provide -a list of all tags that are considered "final" (tags with contents that -should be put into one "message" in the POT file), "ignored" (skipped -over), and "space preserving". +Yelp. -Sane defaults are available for DocBook documents and other common -document types (like GNOME Summaries and XHTML). For other kinds of -documents, it is possible to use -a (--automatic-tags) to choose -suitable translatable pieces. +%package -n xml2po +License: GPLv2+ +Summary: Tool to extract translatable content from XML documents +Group: System/GUI/GNOME +Requires: libxml2-python +%py_requires + +%description -n xml2po +xml2po is a simple Python program which extracts translatable +content from free-form XML documents and outputs gettext compatible +POT files. %package devel -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: A Collection of Documentation Utilities for GNOME Group: System/GUI/GNOME Requires: %{name} = %{version} -Requires: libxml2-devel # Needed by packages being built with gnome-doc-utils, unless they # use --disable-scrollkeeper Requires: scrollkeeper +Requires: xml2po-devel %description devel The gnome-doc-utils package is a collection of documentation utilities -for the GNOME project. Notably, it contains utilities for building +for the GNOME project. Notably, it contains utilities for building documentation and all auxiliary files in your source tree. It also contains the DocBook XSLT stylesheets that were once distributed with -Yelp. Starting with GNOME 2.8, Yelp requires gnome-doc-utils for XSLT. +Yelp. -It also contains the Python program xml2po that extracts translatable -content from XML documents and outputs gettext-compatible POT files. -For simple tags, it works out-of-the-box. For complicated tags, provide -a list of all tags that are considered "final" (tags with contents that -should be put into one "message" in the POT file), "ignored" (skipped -over), and "space preserving". +%package -n xml2po-devel +License: GPLv2+ +Summary: Tool to extract translatable content from XML documents +Group: System/GUI/GNOME +Requires: libxml2-devel +Requires: xml2po = %{version} -Sane defaults are available for DocBook documents and other common -document types (like GNOME Summaries and XHTML). For other kinds of -documents, it is possible to use -a (--automatic-tags) to choose -suitable translatable pieces. +%description -n xml2po-devel +xml2po is a simple Python program which extracts translatable +content from free-form XML documents and outputs gettext compatible +POT files. %lang_package %prep @@ -95,14 +95,15 @@ suitable translatable pieces. translation-update-upstream %build -# autoreconf fails... -# ACLOCAL="aclocal -I $PWD" autoreconf -f -i %configure\ --disable-scrollkeeper make %{?jobs:-j%jobs} pkgconfigdir=%{_datadir}/pkgconfig %install %makeinstall pkgconfigdir=%{_datadir}/pkgconfig +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif %find_lang %{name} %find_lang gnome-doc-mallard-spec %{name}.lang %find_lang gnome-doc-make %{name}.lang @@ -115,28 +116,33 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README -# xml2po stuff -%{_bindir}/xml2po -%{python_sitelib}/xml2po -# gnome-doc-tool stuff %{_bindir}/gnome-doc-tool %dir %{_datadir}/gnome-doc-utils %{_datadir}/gnome-doc-utils/icons %{_datadir}/gnome-doc-utils/watermarks %{_datadir}/xml/gnome %{_datadir}/xml/mallard -# Misc. -%{_mandir}/man?/*.* + +%files -n xml2po +%defattr (-, root, root) +%doc xml2po/AUTHORS xml2po/ChangeLog xml2po/COPYING xml2po/NEWS xml2po/README +%{_bindir}/xml2po +%{python_sitelib}/xml2po +%{_mandir}/man?/xml2po.* %files devel %defattr (-, root, root) %{_bindir}/gnome-doc-prepare %{_datadir}/aclocal/gnome-doc-utils.m4 -%{_datadir}/pkgconfig/*.pc +%{_datadir}/pkgconfig/gnome-doc-utils.pc %{_datadir}/gnome-doc-utils/gnome-doc-utils.make %{_datadir}/gnome-doc-utils/templates %{_datadir}/gnome-doc-utils/template*.* +%files -n xml2po-devel +%defattr (-, root, root) +%{_datadir}/pkgconfig/xml2po.pc + %files lang -f %{name}.lang %defattr (-, root, root) # Own these directories to not depend on gnome-common while building: