rpms/lxpanel/F-10 lxpanel-0.3.8.1-nm-connection-editor.patch, NONE, 1.1 lxpanel-0.4.0-manpages.patch, NONE, 1.1 lxpanel-0.4.1-cpu-history.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 lxpanel-default.patch, 1.5, 1.6 lxpanel.spec, 1.16, 1.17 sources, 1.10, 1.11 lxpanel-0.2.8-manpage.patch, 1.2, NONE
Christoph Wickert
cwickert at fedoraproject.org
Sat Jul 25 02:49:41 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/lxpanel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16824
Modified Files:
.cvsignore lxpanel-default.patch lxpanel.spec sources
Added Files:
lxpanel-0.3.8.1-nm-connection-editor.patch
lxpanel-0.4.0-manpages.patch lxpanel-0.4.1-cpu-history.patch
Removed Files:
lxpanel-0.2.8-manpage.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.0-manpages.patch:
lxpanel.1 | 74 +++++++++++++++++++++++++++++++++++++++++++++++------------
lxpanelctl.1 | 54 +++++++++++++++++++++++++++++++------------
2 files changed, 100 insertions(+), 28 deletions(-)
--- NEW FILE lxpanel-0.4.0-manpages.patch ---
diff -dur lxpanel-0.4.0.orig/man/lxpanel.1 lxpanel-0.4.0/man/lxpanel.1
--- lxpanel-0.4.0.orig/man/lxpanel.1 2009-04-20 17:18:04.000000000 +0200
+++ lxpanel-0.4.0/man/lxpanel.1 2009-04-24 18:45:34.000000000 +0200
@@ -1,14 +1,60 @@
-Using catalogs: /etc/sgml/sgml-docbook-4.1-1.0-41.fc10.cat
-Using stylesheet: /usr/share/sgml/docbook/utils-0.6.14/docbook-utils.dsl#print
-Working on: /home/pcman/Projects/lxde/trunk/lxpanel/man/lxpanel.sgml
-.sp
-.RS
-.sp
-.nf
- <grandpaul at gmail.com>
-
-.sp
-.fi
-.RE
-.sp
-Ying-Chun Liu 2008paulliuDone.
+.TH "LXPANEL" "1"
+.SH "NAME"
+lxpanel \(em a lightweight GTK2-based panel for LXDE desktop.
+.SH "SYNOPSIS"
+.PP
+\fBlxpanel\fR
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBlxpanel\fR command.
+.PP
+\fBlxpanel\fR is a program that provides a panel
+for desktop, usually for LXDE. It is lightweight GTK+ 2.x based desktop
+panel.
+
+.PP
+Features
+.IP " \(bu" 6
+User-friendly application menu automatically generated from \fB.desktop\fP files on the system.
+
+.IP " \(bu" 6
+Launcher bar (small icons clicked to launch apps)
+.IP " \(bu" 6
+Task bar supporting urgency hint (can be flash when gaim gets new
+incoming messages)
+.IP " \(bu" 6
+Notification area (system tray)
+.IP " \(bu" 6
+Digital clock
+.IP " \(bu" 6
+Run dialog (a dialog let you type a command and run, can be called
+in external programs)
+.IP " \(bu" 6
+Net status icon plug-in (optional)
+.IP " \(bu" 6
+Volume control plug-in (optional)
+.IP " \(bu" 6
+lxpanelctl, an external controller let you control lxpanel in
+other programs. For example, "lxpanelctl run" will show the Run
+dialog in lxpanel, and "lxpanelctl menu" will show the application
+menu. This is useful in key bindings provided by window managers.
+.SH "FILES"
+.IP "\fB~/.config/lxpanel\fP" 10
+config file, can be edited by preference dialog.
+.SH "SEE ALSO"
+.PP
+lxsession (1), lxpanelctl (1).
+.SH "AUTHOR"
+.PP
+This manual page was written by paulliu grandpaul at gmail.com for
+the \fBDebian\fP system (but may be used by others). Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
+
+.\" created by instant / docbook-to-man, Sun 20 Apr 2008, 17:00
diff -dur lxpanel-0.4.0.orig/man/lxpanelctl.1 lxpanel-0.4.0/man/lxpanelctl.1
--- lxpanel-0.4.0.orig/man/lxpanelctl.1 2009-04-20 17:18:04.000000000 +0200
+++ lxpanel-0.4.0/man/lxpanelctl.1 2009-04-24 18:45:34.000000000 +0200
@@ -1,14 +1,40 @@
-Using catalogs: /etc/sgml/sgml-docbook-4.1-1.0-41.fc10.cat
-Using stylesheet: /usr/share/sgml/docbook/utils-0.6.14/docbook-utils.dsl#print
-Working on: /home/pcman/Projects/lxde/trunk/lxpanel/man/lxpanelctl.sgml
-.sp
-.RS
-.sp
-.nf
- <grandpaul at gmail.com>
-
-.sp
-.fi
-.RE
-.sp
-Ying-Chun Liu 2008paulliuDone.
+.TH "LXPANEL" "1"
+.SH "NAME"
+lxpanelctl \(em controller for lxpanel.
+.SH "SYNOPSIS"
+.PP
+\fBlxpanelctl\fR command
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBlxpanelctl\fR command.
+.PP
+\fBlxpanelctl\fR is a program that controls lxpanel.
+
+.SH "COMMANDS"
+.IP "\fBmenu\fR " 10
+show system menu
+.IP "\fBrun\fR " 10
+show run dialog
+.IP "\fBconfig\fR " 10
+show config dialog
+.IP "\fBrestart\fR " 10
+restart lxpanel
+.IP "\fBexit\fR " 10
+exit lxpanel
+.SH "SEE ALSO"
+.PP
+lxpanel (1).
+.SH "AUTHOR"
+.PP
+This manual page was written by paulliu grandpaul at gmail.com for
+the \fBDebian\fP system (but may be used by others). Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
+
+.\" created by instant / docbook-to-man, Sun 20 Apr 2008, 17:00
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-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 1 Nov 2008 04:16:39 -0000 1.10
+++ .cvsignore 25 Jul 2009 02:49:41 -0000 1.11
@@ -1,2 +1 @@
-lxpanel-0.3.8.1.tar.gz
-gnome-run.png
+lxpanel-0.4.1.tar.gz
lxpanel-default.patch:
panel.in | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Index: lxpanel-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-10/lxpanel-default.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lxpanel-default.patch 1 Nov 2008 04:16:39 -0000 1.5
+++ lxpanel-default.patch 25 Jul 2009 02:49:41 -0000 1.6
@@ -1,15 +1,7 @@
diff -up lxpanel-0.3.8.1/data/default/panels/panel.in.orig lxpanel-0.3.8.1/data/default/panels/panel.in
--- lxpanel-0.3.8.1/data/default/panels/panel.in.orig 2008-08-28 21:19:43.000000000 +0200
+++ lxpanel-0.3.8.1/data/default/panels/panel.in 2008-08-28 21:20:00.000000000 +0200
-@@ -35,6 +35,7 @@
- separator {
- }
- item {
-+ image=gnome-run
- command=run
- }
- separator {
-@@ -50,13 +51,10 @@ Plugin {
+@@ -50,13 +50,10 @@ Plugin {
type = launchbar
Config {
Button {
@@ -24,3 +16,4 @@ diff -up lxpanel-0.3.8.1/data/default/pa
}
}
}
+
Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-10/lxpanel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- lxpanel.spec 1 Nov 2008 04:46:04 -0000 1.16
+++ lxpanel.spec 25 Jul 2009 02:49:41 -0000 1.17
@@ -4,40 +4,58 @@
#define _default_patch_fuzz 0
Name: lxpanel
-Version: 0.3.8.1
-Release: 3%{?dist}
+Version: 0.4.1
+Release: 2%{?dist}
Summary: A lightweight X11 desktop panel
Group: User Interface/Desktops
License: GPLv2+
URL: http://lxde.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
-Source1: gnome-run.png
Patch1: lxpanel-default.patch
-Patch2: lxpanel-0.2.8-manpage.patch
-# Posted on LXDE mailing list by Jürgen Hötzel, see
-# http://sourceforge.net/mailarchive/forum.php?thread_name=20081026205556.GA20553%40p15200770.pureserver.info&forum_name=lxde-list
-Patch3: lxpanel-battery-callback.patch
+Patch2: lxpanel-0.4.0-manpages.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
+#BuildRequires: docbook-utils
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: intltool
-BuildRequires: libXmu-devel
+#BuildRequires: libXmu-devel
BuildRequires: libXpm-devel
BuildRequires: startup-notification-devel
+# required for alsa mixer plugin
+BuildRequires: alsa-lib-devel
+# required for netstatus plugin
+BuildRequires: wireless-tools-devel
+BuildRequires: menu-cache-devel
%description
lxpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM
compliant window manager (eg sawfish, metacity, xfwm4, kwin) and features a
tasklist, pager, launchbar, clock, menu and sytray.
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk2-devel
+Requires: libXpm-devel
+#Requires: libXmu-devel
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
%prep
%setup -q
%patch1 -p1 -b .default
%patch2 -p1 -b .manpage
-%patch3 -p0 -b .callback
+%patch3 -p1 -b .system-config-network
+%patch4 -p1 -b .history
%build
%configure
@@ -50,8 +68,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/images/
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,7 +80,31 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/lxpanel/
%{_mandir}/man1/lxpanel*
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/lxpanel/
+%{_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)
+
+* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.3.999-1
+- Update to 0.4.0 Beta 2
+- Build alsa mixer plugin
+- BR wireless-tools-devel
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.8.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> 0.3.8.1-3
- Add battery callback patch
- Add gnome-run icon and update default patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 1 Nov 2008 04:16:39 -0000 1.10
+++ sources 25 Jul 2009 02:49:41 -0000 1.11
@@ -1,2 +1 @@
-18b03bd5556d14b8bd1adf00f4e95574 lxpanel-0.3.8.1.tar.gz
-2c84679ed6c5cc86a305e6d06e52b01a gnome-run.png
+cdc16f8126bc21c9a5f17f21433c1bf2 lxpanel-0.4.1.tar.gz
--- lxpanel-0.2.8-manpage.patch DELETED ---
More information about the fedora-extras-commits
mailing list