rpms/lxpanel/F-11 lxpanel-0.3.8.1-nm-connection-editor.patch, NONE, 1.1 lxpanel-0.4.1-cpu-history.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 lxpanel.spec, 1.19, 1.20 sources, 1.12, 1.13 lxpanel-0.3.8.1-system-config-network.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Sat Jul 25 02:44:29 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/lxpanel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13400
Modified Files:
.cvsignore lxpanel.spec sources
Added Files:
lxpanel-0.3.8.1-nm-connection-editor.patch
lxpanel-0.4.1-cpu-history.patch
Removed Files:
lxpanel-0.3.8.1-system-config-network.patch
Log Message:
* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.1-2
- Patch to fix CPU usage monitor history
- Make netstatus plugin prefer nm-connetction-editor over system-config-network
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
lxpanel-0.3.8.1-nm-connection-editor.patch:
netstatus-dialog.c | 3 ++-
netstatus.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE lxpanel-0.3.8.1-nm-connection-editor.patch ---
diff -dur lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus.c lxpanel-0.3.8.1/src/plugins/netstatus/netstatus.c
--- lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus.c 2008-04-20 10:44:13.000000000 +0200
+++ lxpanel-0.3.8.1/src/plugins/netstatus/netstatus.c 2009-01-06 06:28:35.000000000 +0100
@@ -125,7 +125,7 @@
else
{
ns->iface = g_strdup("eth0");
- ns->config_tool = g_strdup("network-admin --configure %i");
+ ns->config_tool = g_strdup("nm-connection-editor");
}
iface = netstatus_iface_new(ns->iface);
diff -dur lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus-dialog.c lxpanel-0.3.8.1/src/plugins/netstatus/netstatus-dialog.c
--- lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus-dialog.c 2008-04-20 10:44:13.000000000 +0200
+++ lxpanel-0.3.8.1/src/plugins/netstatus/netstatus-dialog.c 2009-01-06 06:28:35.000000000 +0100
@@ -42,7 +42,8 @@
#if 0 /* stripped-down version does nothing to configurators. */
static const char *network_config_tools[] = {
- "network-admin --configure %i",
+ "nm-connection-editor",
+ "system-config-network",
"redhat-config-network",
"system-control-network"
};
lxpanel-0.4.1-cpu-history.patch:
cpu.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE lxpanel-0.4.1-cpu-history.patch ---
--- a/src/plugins/cpu/cpu.c 2008-12-10 15:37:34.452819574 -0600
+++ b/src/plugins/cpu/cpu.c 2009-06-03 18:28:59.904598839 -0500
@@ -116,11 +116,17 @@
ENTER;
if (c->pixmap)
g_object_unref(c->pixmap);
+tick *t0;
+t0= g_new0( typeof(*c->stats_cpu), widget->allocation.width);
+unsigned int imax;
+imax=c->Wwg > widget->allocation.width? widget->allocation.width:c->Wwg;
+memcpy(t0,c->stats_cpu,imax*sizeof(tick));
+
c->Wwg = widget->allocation.width;
c->Hwg = widget->allocation.height;
if (c->stats_cpu)
g_free(c->stats_cpu);
- c->stats_cpu = g_new0( typeof(*c->stats_cpu), c->Wwg);
+c->stats_cpu = t0;
/* set pixmap size */
c->pixmap = gdk_pixmap_new (widget->window,
widget->allocation.width-BORDER_SIZE * 2,
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 24 Apr 2009 20:28:21 -0000 1.12
+++ .cvsignore 25 Jul 2009 02:44:29 -0000 1.13
@@ -1 +1 @@
-lxpanel-0.4.0.tar.gz
+lxpanel-0.4.1.tar.gz
Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-11/lxpanel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- lxpanel.spec 24 Apr 2009 20:28:21 -0000 1.19
+++ lxpanel.spec 25 Jul 2009 02:44:29 -0000 1.20
@@ -4,8 +4,8 @@
#define _default_patch_fuzz 0
Name: lxpanel
-Version: 0.4.0
-Release: 1%{?dist}
+Version: 0.4.1
+Release: 2%{?dist}
Summary: A lightweight X11 desktop panel
Group: User Interface/Desktops
@@ -14,7 +14,9 @@ URL: http://lxde.sourceforge.
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
Patch1: lxpanel-default.patch
Patch2: lxpanel-0.4.0-manpages.patch
-Patch3: lxpanel-0.3.8.1-system-config-network.patch
+Patch3: lxpanel-0.3.8.1-nm-connection-editor.patch
+# http://sourceforge.net/tracker/?func=detail&aid=2800828&group_id=180858&atid=894871
+Patch4: lxpanel-0.4.1-cpu-history.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildRequires: docbook-utils
@@ -53,6 +55,7 @@ developing applications that use %{name}
%patch1 -p1 -b .default
%patch2 -p1 -b .manpage
%patch3 -p1 -b .system-config-network
+%patch4 -p1 -b .history
%build
%configure
@@ -83,6 +86,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/lxpanel.pc
%changelog
+* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.1-2
+- Patch to fix CPU usage monitor history
+- Make netstatus plugin prefer nm-connetction-editor over system-config-network
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 05 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.1-1
+- Update to 0.4.1
+
* Fri Apr 24 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.4.0-1
- Update to 0.4.0 final (fixes #496833)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 24 Apr 2009 20:28:21 -0000 1.12
+++ sources 25 Jul 2009 02:44:29 -0000 1.13
@@ -1 +1 @@
-a03c7b21338a812207b035204f6dad6e lxpanel-0.4.0.tar.gz
+cdc16f8126bc21c9a5f17f21433c1bf2 lxpanel-0.4.1.tar.gz
--- lxpanel-0.3.8.1-system-config-network.patch DELETED ---
More information about the fedora-extras-commits
mailing list