OBS User autobuild 2009-12-08 09:35:34 +00:00 committed by Git OBS Bridge
parent 1cb6b1d3f7
commit 6a326f0282
5 changed files with 5 additions and 112 deletions

View File

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

View File

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

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,23 +1,3 @@
-------------------------------------------------------------------
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 Mon Sep 28 17:08:42 CEST 2009 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-doc-utils (Version 0.18.1) # spec file for package gnome-doc-utils (Version 0.18.0)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,15 +18,13 @@
Name: gnome-doc-utils Name: gnome-doc-utils
Version: 0.18.1 Version: 0.18.0
Release: 1 Release: 1
License: GPL v2 or later ; LGPL v2.1 or later License: GPL v2 or later ; LGPL v2.1 or later
Summary: A Collection of Documentation Utilities for GNOME Summary: A Collection of Documentation Utilities for GNOME
Url: http://www.gnome.org Url: http://www.gnome.org
Group: System/GUI/GNOME Group: System/GUI/GNOME
Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.8/%{name}-%{version}.tar.bz2 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: docbook_4
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: intltool BuildRequires: intltool
@ -94,7 +92,6 @@ suitable translatable pieces.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1
translation-update-upstream translation-update-upstream
%build %build