Accepting request 29722 from GNOME:Factory

Copy from GNOME:Factory/gnome-doc-utils based on submit request 29722 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/29722
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-doc-utils?expand=0&rev=28
This commit is contained in:
OBS User autobuild 2010-01-29 14:01:05 +00:00 committed by Git OBS Bridge
parent 3c4832ae24
commit 4dcb58009d
5 changed files with 82 additions and 129 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f601f602a99023fb8d46b3e5dec460357d719d9c6aae9600520f1b786d4f545f
size 783694

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee5798361e4396269820aa7571bcf173e77c454ed2b1a38b9fc1dcbd7f58abae
size 854440

View File

@ -1,84 +0,0 @@
From 984063e7a4189b31cff99e61736d01eb5d3906f6 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 26 Oct 2009 15:13:30 +0000
Subject: Properly clean mo files (finally fixes #570342)
---
Index: gnome-doc-utils-0.18.0/tools/gnome-doc-utils.make
===================================================================
--- gnome-doc-utils-0.18.0.orig/tools/gnome-doc-utils.make
+++ gnome-doc-utils-0.18.0/tools/gnome-doc-utils.make
@@ -266,6 +266,13 @@ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_I
.PHONY: po
po: $(_DOC_POFILES)
+## @ _DOC_MOFILES
+## The .mo files used for translating the document
+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
+
+.PHONY: mo
+mo: $(_DOC_MOFILES)
+
## @ _DOC_LC_MODULES
## The top-level documentation files in all other locales
_DOC_LC_MODULES = $(if $(DOC_MODULE), \
@@ -332,16 +339,19 @@ $(_DOC_POFILES):
$(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
fi
+$(_DOC_MOFILES): %.mo: %.po
+ msgfmt -o $@ $<
+
# FIXME: fix the dependancy
# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
+$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
if ! test -d $(dir $@); then mkdir $(dir $@); fi
if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
+ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
+ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
(cd $(dir $@) && \
- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
+ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
"$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
@@ -386,12 +396,14 @@ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
rm -f $(_DOC_LC_DOCS)
+ rm -f $(_DOC_MOFILES)
@list='$(_DOC_POFILES)'; for po in $$list; do \
if ! test "$$po" -ef "$(srcdir)/$$po"; then \
echo "rm -f $$po"; \
rm -f "$$po"; \
fi; \
done
+# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
@for lc in C $(_DOC_REAL_LINGUAS); do \
if test -f "$$lc/.xml2po.mo"; then \
echo "rm -f $$lc/.xml2po.mo"; \
commit ce05d9fdadfc227cad82450623a0616a2a3db84b
Author: Shaun McCance <shaunm@gnome.org>
Date: Mon Nov 16 14:21:45 2009 -0600
[gnome-doc-utils.make] Fixed error for missing directory for mo files
diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make
index ac47130..97fd549 100644
--- a/tools/gnome-doc-utils.make
+++ b/tools/gnome-doc-utils.make
@@ -340,6 +340,10 @@ $(_DOC_POFILES):
fi
$(_DOC_MOFILES): %.mo: %.po
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+ mkdir "$(dir $@)"; \
+ fi
msgfmt -o $@ $<
# FIXME: fix the dependancy

View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
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

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-doc-utils (Version 0.18.1)
# spec file for package gnome-doc-utils (Version 0.19.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,15 +18,13 @@
Name: gnome-doc-utils
Version: 0.18.1
Version: 0.19.2
Release: 1
License: GPLv2+ ; LGPLv2.1+
Summary: A Collection of Documentation Utilities for GNOME
Url: http://www.gnome.org
Group: System/GUI/GNOME
Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.8/%{name}-%{version}.tar.bz2
# PATCH-FIx-UPSTREAM gnome-doc-utils-make-parallel.patch bgo#570342 dimstar@opensuse.org -- Enable parallel build (make -j<n>)
Patch0: gnome-doc-utils-make-parallel.patch
BuildRequires: docbook_4
BuildRequires: fdupes
BuildRequires: intltool
@ -36,76 +34,76 @@ 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: 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
%setup -q
%patch0 -p1
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
@ -118,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: