Hello community, here is the log from the commit of package Terminal for openSUSE:12.1 checked in at 2011-10-25 17:13:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/Terminal (Old) and /work/SRC/openSUSE:12.1/.Terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Terminal", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1/Terminal/Terminal.changes 2011-10-24 12:26:35.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.Terminal.new/Terminal.changes 2011-10-25 17:13:22.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Oct 20 18:05:28 UTC 2011 - [email protected] + +- dropped Terminal-0.4.8-honor-htmldir.patch +- added Terminal-0.4.8-fix-help.patch in order to fix help by + making sure there is no trailing '#' in URLs which make + exo-helper-1 choke +- install HTML documentation under /usr/share/xfce4/Terminal/html + +------------------------------------------------------------------- Old: ---- Terminal-0.4.8-honor-htmldir.patch New: ---- Terminal-0.4.8-fix-help.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Terminal.spec ++++++ --- /var/tmp/diff_new_pack.bQitt7/_old 2011-10-25 17:13:23.000000000 +0200 +++ /var/tmp/diff_new_pack.bQitt7/_new 2011-10-25 17:13:23.000000000 +0200 @@ -26,8 +26,8 @@ Group: System/X11/Terminals Source0: %{name}-%{version}.tar.bz2 Source1: %name-rpmlintrc -# PATCH-FIX-UPSTREAM Terminal-0.4.8-honor-htmldir.patch [email protected] -- Install HTML documentation under htmldir -Patch0: Terminal-0.4.8-honor-htmldir.patch +# PATCH-FIX-UPSTREAM Terminal-0.4.8-fix-help.patch [email protected] -- Fix help by making sure there is no trailing '#' in URLs which make exo-helper-1 choke +Patch0: Terminal-0.4.8-fix-help.patch BuildRequires: intltool BuildRequires: libpng-devel BuildRequires: pkgconfig(dbus-1) @@ -69,9 +69,7 @@ %build xdt-autogen -%configure \ - --docdir=%{_defaultdocdir}/%{name} \ - --htmldir=%{_defaultdocdir}/%{name}/html +%configure --docdir=%{_datadir}/xfce4/Terminal/html make %{?_smp_mflags} V=1 %install @@ -86,8 +84,6 @@ ln -sf "${manpage##*/}" \ "$(printf "%s\n" "${manpage##*/}" | tr [:upper:] [:lower:])" ) done -install -p -m 0644 README ChangeLog COPYING AUTHORS HACKING NEWS THANKS \ - %{buildroot}%{_defaultdocdir}/Terminal/ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} @@ -107,8 +103,7 @@ %files %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name} -%exclude %{_defaultdocdir}/%{name}/html +%doc README ChangeLog COPYING AUTHORS HACKING NEWS THANKS %{_bindir}/Terminal %{_bindir}/terminal %dir %{_datadir}/Terminal @@ -134,7 +129,9 @@ %files doc %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name}/html +%dir %{_datadir}/xfce4 +%dir %{_datadir}/xfce4/Terminal +%doc %{_datadir}/xfce4/Terminal/html/ %files lang -f %{name}.lang ++++++ Terminal-0.4.8-fix-help.patch ++++++ Index: Terminal-0.4.8/terminal/terminal-dialogs.c =================================================================== --- Terminal-0.4.8.orig/terminal/terminal-dialogs.c +++ Terminal-0.4.8/terminal/terminal-dialogs.c @@ -285,7 +285,7 @@ terminal_dialogs_show_help (GtkWindow /* build the full uri, fallback to online docs if nothing was found */ if (G_LIKELY (exists)) { - uri = g_strconcat ("file://", filename, "#", offset, NULL); + uri = g_strconcat ("file://", filename, (offset) ? ("#", offset) : "", NULL); } else if (terminal_dialogs_show_help_ask_online (parent)) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
