Hello community, here is the log from the commit of package gnome-user-docs for openSUSE:Factory checked in at Thu Sep 15 12:05:37 CEST 2011.
-------- --- GNOME/gnome-user-docs/gnome-user-docs.changes 2011-09-06 11:41:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-user-docs/gnome-user-docs.changes 2011-09-15 06:53:30.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Sep 14 21:27:29 UTC 2011 - [email protected] + +- Add gnome-user-docs-no-destdir.patch: do not use $DESTDIR in the + link target when creating symlinks for figures. This would create + symlinks to a non-existing file for the package, which would then + break the build of bundle-lang-gnome. +- Remove --disable-scrollkeeper from configure: the option doesn't + exist anymore (as gnome-user-docs moved to itstool to build help + documents). + +------------------------------------------------------------------- +Wed Sep 14 07:51:46 UTC 2011 - [email protected] + +- Add missing %defattr for lang subpackage, to fix build + warnings/errors. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-user-docs-no-destdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-user-docs.spec ++++++ --- /var/tmp/diff_new_pack.yEWaOe/_old 2011-09-15 12:05:33.000000000 +0200 +++ /var/tmp/diff_new_pack.yEWaOe/_new 2011-09-15 12:05:33.000000000 +0200 @@ -19,13 +19,15 @@ Name: gnome-user-docs Version: 3.1.1 -Release: 1 +Release: 2 # FIXME: the %%{_datadir}/help/$locale/ files should be found by %%find_lang License: GFDL 1.1 Summary: GNOME Desktop Documentation Url: http://www.gnome.org Group: Documentation/Other Source: http://download.gnome.org/sources/gnome-user-docs/3.1/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gnome-user-docs-no-destdir.patch [email protected] -- No $DESTDIR when creating links +Patch0: gnome-user-docs-no-destdir.patch BuildRequires: fdupes BuildRequires: itstool Recommends: %{name}-lang @@ -42,10 +44,10 @@ %lang_package %prep %setup -q +%patch0 -p1 %build -%configure\ - --disable-scrollkeeper +%configure make %{?jobs:-j%jobs} %install @@ -58,7 +60,8 @@ echo "%%lang($LOCALE) %%dir %%{_datadir}/help/$LOCALE" >> %{name}.help-lang.tmp echo "%%lang($LOCALE) %%doc /${help##%{buildroot}}" >> %{name}.help-lang.tmp done -sort -u %{name}.help-lang.tmp | grep -v "^%%lang(C)" > %{name}.help-lang +echo "%%defattr(-,root,root)" > %{name}.help-lang +sort -u %{name}.help-lang.tmp | grep -v "^%%lang(C)" >> %{name}.help-lang rm %{name}.help-lang.tmp %fdupes %{buildroot} ++++++ gnome-user-docs-no-destdir.patch ++++++ Index: gnome-user-docs-3.1.1/aclocal.m4 =================================================================== --- gnome-user-docs-3.1.1.orig/aclocal.m4 +++ gnome-user-docs-3.1.1/aclocal.m4 @@ -159,8 +159,8 @@ install-help: echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ elif test "x$$lc" != "xC"; then \ - echo "$(LN_S) -f $(DESTDIR)$(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(DESTDIR)$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ fi; \ done; \ done Index: gnome-user-docs-3.1.1/configure =================================================================== --- gnome-user-docs-3.1.1.orig/configure +++ gnome-user-docs-3.1.1/configure @@ -2431,8 +2431,8 @@ install-help: echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ elif test "x$$lc" != "xC"; then \ - echo "$(LN_S) -f $(DESTDIR)$(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(DESTDIR)$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ fi; \ done; \ done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
