Hello community, here is the log from the commit of package xfce-utils for openSUSE:Factory checked in at Tue Apr 19 09:29:12 CEST 2011.
-------- --- xfce-utils/xfce-utils.changes 2011-02-18 01:26:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce-utils/xfce-utils.changes 2011-04-18 14:20:58.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 18 10:42:28 UTC 2011 - g...@opensuse.org + +- added xfce-utils-4.8.1-honor-docdir.patch in which derives the + documentation base pathname from docdir instead of hardcoding it + to datadir/doc (bxo#7512) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xfce-utils-4.8.1-fix-doc-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce-utils.spec ++++++ --- /var/tmp/diff_new_pack.6hSWEX/_old 2011-04-19 09:28:41.000000000 +0200 +++ /var/tmp/diff_new_pack.6hSWEX/_new 2011-04-19 09:28:41.000000000 +0200 @@ -19,7 +19,7 @@ Name: xfce-utils Version: 4.8.1 -Release: 5 +Release: 6 License: GPLv2+ Summary: Collection of Scripts and Utilities for the Xfce Desktop Environment Url: http://www.xfce.org/projects/xfce-utils/ @@ -27,6 +27,9 @@ Source: xfce-utils-%{version}.tar.bz2 Source1: xflock4.sh Source100: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM xfce-utils-4.8.1-fix-doc-path.patch bxo#7512 g...@opensuse.org -- Derive the documentation base pathname from docdir instead of hardcoding it to datadir/doc +Patch0: xfce-utils-4.8.1-fix-doc-path.patch +BuildRequires: xfce4-dev-tools BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig(gtk+-2.0) @@ -62,8 +65,10 @@ %lang_package %prep %setup -q -n xfce-utils-%{version} +%patch0 -p1 %build +xdt-autogen %configure --docdir=%{_defaultdocdir}/%{name} make V=1 %{?_smp_mflags} ++++++ xfce-utils-4.8.1-fix-doc-path.patch ++++++ diff -ur xfce-utils-4.8.1.orig/scripts/Makefile.am xfce-utils-4.8.1/scripts/Makefile.am --- xfce-utils-4.8.1.orig/scripts/Makefile.am 2011-01-30 17:39:30.000000000 +0100 +++ xfce-utils-4.8.1/scripts/Makefile.am 2011-04-18 13:53:15.000000000 +0200 @@ -12,6 +12,7 @@ # cannot be set from configure, because ${prefix} is not expanded edit = sed \ -e "s,@_datadir_\@,$(datadir),g" \ + -e "s,@_docroot_\@,$$(dirname $(docdir)),g" \ -e "s,@_libdir_\@,$(libdir),g" \ -e "s,@_sysconfdir_\@,$(sysconfdir),g" \ -e "s,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g" \ diff -ur xfce-utils-4.8.1.orig/scripts/xfhelp4.in xfce-utils-4.8.1/scripts/xfhelp4.in --- xfce-utils-4.8.1.orig/scripts/xfhelp4.in 2011-01-30 17:39:30.000000000 +0100 +++ xfce-utils-4.8.1/scripts/xfhelp4.in 2011-04-18 13:05:34.000000000 +0200 @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -HELP_DIR="@_datadir_@/doc" +HELP_DIR="@_docroot_@" if [ ! x"$1" = x"" ]; then MODULE="${1%.html}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
