Mailinglist Archive: opensuse-commit (926 mails)

< Previous Next >
commit gnome-doc-utils for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 08 Dec 2009 10:35:33 +0100
  • Message-id: <20091208093533.7AE9F20298@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gnome-doc-utils for openSUSE:Factory
checked in at Tue Dec 8 10:35:33 CET 2009.



--------
--- GNOME/gnome-doc-utils/gnome-doc-utils.changes 2009-09-28
17:11:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-doc-utils/gnome-doc-utils.changes
2009-12-02 16:41:17.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Dec 2 16:18:08 CET 2009 - vuntz@xxxxxxxxxxxx
+
+- 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@xxxxxxxxxxxx
+
+- Parallel build still has chances to fail. Disabling for now.
+
+-------------------------------------------------------------------
+Wed Nov 25 13:59:03 CET 2009 - dimstar@xxxxxxxxxxxx
+
+- Add gnome-doc-utils-make-parallel.patch to solve parallel build
+ failures (patch taken from upstream git).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
gnome-doc-utils-0.18.0.tar.bz2

New:
----
gnome-doc-utils-0.18.1.tar.bz2
gnome-doc-utils-make-parallel.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-doc-utils.spec ++++++
--- /var/tmp/diff_new_pack.aDdmef/_old 2009-12-08 10:34:53.000000000 +0100
+++ /var/tmp/diff_new_pack.aDdmef/_new 2009-12-08 10:34:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-doc-utils (Version 0.18.0)
+# spec file for package gnome-doc-utils (Version 0.18.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,13 +18,15 @@


Name: gnome-doc-utils
-Version: 0.18.0
+Version: 0.18.1
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
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@xxxxxxxxxxxx -- Enable parallel build (make -j<n>)
+Patch0: gnome-doc-utils-make-parallel.patch
BuildRequires: docbook_4
BuildRequires: fdupes
BuildRequires: intltool
@@ -61,7 +63,7 @@
suitable translatable pieces.

%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}
@@ -92,6 +94,7 @@
%lang_package
%prep
%setup -q
+%patch0 -p1
translation-update-upstream

%build

++++++ gnome-doc-utils-0.18.0.tar.bz2 -> gnome-doc-utils-0.18.1.tar.bz2 ++++++
++++ 27535 lines of diff (skipped)

++++++ gnome-doc-utils-make-parallel.patch ++++++
From 984063e7a4189b31cff99e61736d01eb5d3906f6 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@xxxxxxxxxxx>
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@xxxxxxxxx>
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

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages