Hello community, here is the log from the commit of package xfce4-power-manager for openSUSE:Factory checked in at 2012-05-10 14:35:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old) and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-power-manager", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes 2012-05-08 11:49:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes 2012-05-10 14:35:20.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 7 11:58:44 UTC 2012 - [email protected] + +- removed xfce4-power-manager-1.0.10-use-docdir.patch and + added xfce4-power-manager-fix-help.patch in order to use + xfce_dialog_show_help() instead of calling xfhelp4 and to remove + the bundled documentation (bxo#8846) + +------------------------------------------------------------------- Old: ---- xfce4-power-manager-1.0.10-use-docdir.patch New: ---- xfce4-power-manager-fix-help.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.6FAcMk/_old 2012-05-10 14:35:22.000000000 +0200 +++ /var/tmp/diff_new_pack.6FAcMk/_new 2012-05-10 14:35:22.000000000 +0200 @@ -26,8 +26,8 @@ Group: System/GUI/XFCE Url: http://goodies.xfce.org/projects/applications/xfce4-power-manager Source: http://archive.xfce.org/src/apps/xfce4-power-manager/1.2/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM xfce4-power-manager-use-docdir.patch [email protected] -- Use docdir correctly -Patch0: xfce4-power-manager-1.0.10-use-docdir.patch +# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-help.patch bxo#8846 [email protected] -- Use xfce_dialog_show_help() and remove the bundled documentation +Patch0: xfce4-power-manager-fix-help.patch BuildRequires: ed BuildRequires: fdupes BuildRequires: intltool @@ -49,7 +49,8 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrandr) Recommends: %{name}-lang = %{version} -Recommends: %{name}-doc = %{version} +Provides: xfce4-power-manager-doc = %{version} +Obsoletes: xfce4-power-manager-doc <= 1.2.0 Suggests: xfce4-panel-plugin-brightness BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,15 +74,6 @@ This package provides a plugin for the Xfce panel which allows one to regulate display brightness. -%package doc -Summary: Documentation for xfce4-power-manager -Group: Documentation/HTML -BuildArch: noarch -Requires: %{name} = %{version} - -%description doc -This package contains the documentation for xfce4-power-manager. - %lang_package %prep @@ -96,7 +88,6 @@ %build xdt-autogen %configure \ - --docdir=%{_datadir}/xfce4/xfce4-power-manager \ --disable-hal make %{?_smp_mflags} V=1 @@ -138,12 +129,6 @@ %{_datadir}/applications/xfce4-power-manager-settings.desktop %{_datadir}/icons/hicolor/*/*/* -%files doc -%defattr(-,root,root) -%dir %{_datadir}/xfce4 -%dir %{_datadir}/xfce4/xfce4-power-manager -%doc %{_datadir}/xfce4/xfce4-power-manager/html/ - %files lang -f %{name}.lang %files -n xfce4-panel-plugin-brightness ++++++ xfce4-power-manager-fix-help.patch ++++++ Index: xfce4-power-manager-1.2.0/settings/xfpm-settings.c =================================================================== --- xfce4-power-manager-1.2.0.orig/settings/xfpm-settings.c +++ xfce4-power-manager-1.2.0/settings/xfpm-settings.c @@ -1617,7 +1617,7 @@ static void dialog_response_cb (GtkDialo switch(response) { case GTK_RESPONSE_HELP: - xfpm_help(); + xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-power-manager", "preferences", NULL); break; default: settings_quit (GTK_WIDGET (dialog), channel); Index: xfce4-power-manager-1.2.0/src/xfpm-power.c =================================================================== --- xfce4-power-manager-1.2.0.orig/src/xfpm-power.c +++ xfce4-power-manager-1.2.0/src/xfpm-power.c @@ -470,6 +470,12 @@ xfpm_power_presentation_mode_cb (XfpmPow } static void +xfpm_power_help_cb (GtkMenuItem *menuitem, gpointer user_data) +{ + xfce_dialog_show_help (NULL, "xfce4-power-manager", NULL, NULL); +} + +static void xfpm_power_show_tray_menu (XfpmPower *power, GtkStatusIcon *icon, guint button, @@ -585,7 +591,7 @@ xfpm_power_show_tray_menu (XfpmPower *po mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL); gtk_widget_set_sensitive (mi, TRUE); gtk_widget_show (mi); - g_signal_connect (mi, "activate", G_CALLBACK (xfpm_help), NULL); + g_signal_connect (mi, "activate", G_CALLBACK (xfpm_power_help_cb), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); Index: xfce4-power-manager-1.2.0/Makefile.am =================================================================== --- xfce4-power-manager-1.2.0.orig/Makefile.am +++ xfce4-power-manager-1.2.0/Makefile.am @@ -11,8 +11,7 @@ SUBDIRS = \ src \ settings \ $(plugins_dir) \ - po \ - doc + po EXTRA_DIST = \ @@ -41,9 +40,6 @@ dist-hook: ChangeLog distclean-local: rm -rf *.cache -html: Makefile - make -C doc html - dist-bz2: dist zcat $(PACKAGE)-$(VERSION).tar.gz | \ bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2 Index: xfce4-power-manager-1.2.0/configure.ac =================================================================== --- xfce4-power-manager-1.2.0.orig/configure.ac +++ xfce4-power-manager-1.2.0/configure.ac @@ -240,10 +240,6 @@ data/icons/scalable/Makefile data/icons/scalable/status/Makefile data/icons/scalable/actions/Makefile data/interfaces/Makefile -doc/Makefile -doc/C/Makefile -doc/C/xfce4-power-manager.xml -doc/C/images/Makefile po/Makefile.in ]) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
