Hello community, here is the log from the commit of package xfce4-panel-plugin-fsguard for openSUSE:Factory checked in at 2012-04-19 12:38:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-fsguard (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-fsguard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-fsguard", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-fsguard/xfce4-panel-plugin-fsguard.changes 2011-09-23 12:51:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-fsguard.new/xfce4-panel-plugin-fsguard.changes 2012-04-19 12:38:56.000000000 +0200 @@ -1,0 +2,23 @@ +Tue Apr 17 19:37:48 UTC 2012 - [email protected] + +- corrected source URL + +------------------------------------------------------------------- +Sun Apr 15 08:05:03 UTC 2012 - [email protected] + +- recommend -lang subpackage + +------------------------------------------------------------------- +Tue Apr 3 17:02:21 UTC 2012 - [email protected] + +- added xfce4-fsguard-plugin-fix-config-loading.patch in order to + fix the loading of the configuration file + +------------------------------------------------------------------- +Tue Apr 3 15:20:37 UTC 2012 - [email protected] + +- specfile cleanup +- correct dependencies +- split off -lang subpackage + +------------------------------------------------------------------- New: ---- xfce4-fsguard-plugin-fix-config-loading.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-fsguard.spec ++++++ --- /var/tmp/diff_new_pack.a7MeJY/_old 2012-04-19 12:38:58.000000000 +0200 +++ /var/tmp/diff_new_pack.a7MeJY/_new 2012-04-19 12:38:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce4-panel-plugin-fsguard # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,26 +20,34 @@ %define plugin_name xfce4-fsguard-plugin Name: xfce4-panel-plugin-fsguard -License: GPL-2.0+ Version: 1.0.0 -Release: 5 -Summary: Filesystem space monitoring plugin for the Xfce panel -Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin -Source0: xfce4-fsguard-plugin-1.0.0.tar.bz2 +Release: 0 +Summary: Filesystem Space Monitoring Plugin for the Xfce Panel +License: GPL-2.0+ Group: System/GUI/XFCE -BuildRequires: intltool +Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin +Source0: http://archive.xfce.org/src/panel-plugins/%{plugin_name}/1.0/%{plugin_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM xfce4-fsguard-plugin-fix-config-loading.patch [email protected] -- Fixes loading of the configuration file +Patch0: xfce4-fsguard-plugin-fix-config-loading.patch BuildRequires: fdupes +BuildRequires: intltool +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libxfce4panel-1.0) -Requires: xfce4-panel >= 4.8.0 +BuildRequires: pkgconfig(libxfce4util-1.0) +BuildRequires: pkgconfig(libxfcegui4-1.0) +Requires: xfce4-panel >= %{panel_version} +Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The FSGuard plugin constantly monitors free space of a given mountpoint and displays it as an icon in the panel. +%lang_package %prep %setup -q -n %{plugin_name}-%{version} +%patch0 -p1 %build %configure --disable-static @@ -47,26 +55,28 @@ %install %make_install + rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} -%find_lang %{plugin_name} %{name}.lang + +%find_lang %{plugin_name} %{name}.lang %{?no_lang_C} + %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} -%if 0%{?suse_version} >= 1140 - %post %icon_theme_cache_post %postun %icon_theme_cache_postun -%endif -%files -f %{name}.lang +%files %defattr(-,root,root) %{_libexecdir}/xfce4/panel-plugins/xfce4-fsguard-plugin %{_datadir}/xfce4/panel-plugins/fsguard.desktop %{_datadir}/icons/hicolor/*/apps/xfce4-fsguard-plugin* +%files lang -f %{name}.lang + %changelog ++++++ xfce4-fsguard-plugin-fix-config-loading.patch ++++++ --- xfce4-fsguard-plugin-1.0.0.orig/panel-plugin/fsguard.c +++ xfce4-fsguard-plugin-1.0.0/panel-plugin/fsguard.c @@ -325,15 +325,28 @@ fsguard_read_config (FsGuard *fsguard) char *file; XfceRc *rc; - file = xfce_panel_plugin_save_location (fsguard->plugin, TRUE); + /* prepare default values */ + fsguard->seen = FALSE; + fsguard->name = g_strdup (""); + fsguard->show_name = FALSE; + fsguard->path = g_strdup ("/"); + fsguard->show_size = TRUE; + fsguard->show_progress_bar = TRUE; + fsguard->hide_button = FALSE; + fsguard->limit_warning = 8; + fsguard->limit_urgent = 2; + + file = xfce_panel_plugin_lookup_rc_file(fsguard->plugin); + g_return_if_fail (file); DBG ("Lookup rc file `%s'", file); - rc = xfce_rc_simple_open (file, FALSE); + rc = xfce_rc_simple_open (file, TRUE); g_free (file); g_return_if_fail (rc); - fsguard->seen = FALSE; + g_free (fsguard->name); fsguard->name = g_strdup (xfce_rc_read_entry (rc, "label", "")); fsguard->show_name = xfce_rc_read_bool_entry (rc, "label_visible", FALSE); + g_free (fsguard->path); fsguard->path = g_strdup (xfce_rc_read_entry (rc, "mnt", "/")); fsguard->show_size = xfce_rc_read_bool_entry (rc, "lab_size_visible", TRUE); fsguard->show_progress_bar = xfce_rc_read_bool_entry (rc, "progress_bar_visible", TRUE); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
