[lxpanel] Update to 0.5.9 (#827779)
Christoph Wickert
cwickert at fedoraproject.org
Sun Jun 10 17:32:21 UTC 2012
commit f26bc1864561acc2db35db317432c2cad153eac2
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sun Jun 10 19:32:13 2012 +0200
Update to 0.5.9 (#827779)
- Fix the netstat plugin (#750400)
- Correctly show 'Application launch bar' settings window (#830198)
- Reverse scrolling direction in workspace switcher (#746063)
.gitignore | 1 +
lxpanel-0.5.4-default.patch | 25 -------
lxpanel-0.5.5-dsofix.patch | 11 ---
lxpanel-0.5.6-Fix-pager-scroll.patch | 12 ++++
lxpanel-0.5.9-default.patch | 122 ++++++++++++++++++++++++++++++++++
lxpanel-0.5.9-dsofix.patch | 11 +++
lxpanel.spec | 41 ++++++++----
sources | 2 +-
8 files changed, 176 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 42449eb..b043ca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
lxpanel-0.5.6.tar.gz
/lxpanel-0.5.8.tar.gz
+/lxpanel-0.5.9.tar.gz
diff --git a/lxpanel-0.5.6-Fix-pager-scroll.patch b/lxpanel-0.5.6-Fix-pager-scroll.patch
new file mode 100644
index 0000000..8f9f634
--- /dev/null
+++ b/lxpanel-0.5.6-Fix-pager-scroll.patch
@@ -0,0 +1,12 @@
+diff -dur lxpanel-0.5.6.orig/src/plugins/pager.c lxpanel-0.5.6/src/plugins/pager.c
+--- lxpanel-0.5.6.orig/src/plugins/pager.c 2011-10-13 13:32:30.709231295 -0500
++++ lxpanel-0.5.6/src/plugins/pager.c 2011-10-13 13:33:12.474768952 -0500
+@@ -336,7 +336,7 @@
+ {
+ /* Compute the new desktop from the scroll direction, wrapping at either extreme. */
+ int current_desktop = d->pg->current_desktop;
+- if ((event->direction == GDK_SCROLL_UP) || (event->direction == GDK_SCROLL_RIGHT))
++ if ((event->direction == GDK_SCROLL_DOWN) || (event->direction == GDK_SCROLL_RIGHT))
+ {
+ current_desktop += 1;
+ if (current_desktop >= d->pg->number_of_desktops)
diff --git a/lxpanel-0.5.9-default.patch b/lxpanel-0.5.9-default.patch
new file mode 100644
index 0000000..91c427b
--- /dev/null
+++ b/lxpanel-0.5.9-default.patch
@@ -0,0 +1,122 @@
+diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/default/panels/panel.in
+--- lxpanel-0.5.9.orig/data/default/panels/panel.in 2012-04-08 01:27:42.000000000 +0200
++++ lxpanel-0.5.9/data/default/panels/panel.in 2012-06-10 19:12:25.864088270 +0200
+@@ -14,10 +14,10 @@
+ setdocktype=1
+ setpartialstrut=1
+ usefontcolor=1
+- fontcolor=#ffffff
++ fontcolor=#000000
+ usefontsize=0
+ fontsize=10
+- background=1
++ background=0
+ backgroundfile=@prefix@/share/lxpanel/images/background.png
+ }
+
+@@ -37,12 +37,13 @@
+ separator {
+ }
+ item {
++ image=system-run
+ command=run
+ }
+ separator {
+ }
+ item {
+- image=gnome-logout
++ image=system-log-out
+ command=logout
+ }
+ }
+@@ -52,10 +53,10 @@
+ type = launchbar
+ Config {
+ Button {
+- id=pcmanfm.desktop
++ id=fedora-pcmanfm.desktop
+ }
+ Button {
+- id=gnome-terminal.desktop
++ id=fedora-lxterminal.desktop
+ }
+ Button {
+ id=firefox.desktop
+@@ -75,6 +76,7 @@
+ Config {
+ Button1=iconify
+ Button2=shade
++ Toggle=1
+ }
+ }
+
+diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/bottom.in lxpanel-0.5.9/data/two_panels/panels/bottom.in
+--- lxpanel-0.5.9.orig/data/two_panels/panels/bottom.in 2012-04-08 01:27:42.000000000 +0200
++++ lxpanel-0.5.9/data/two_panels/panels/bottom.in 2012-06-10 18:49:41.559771662 +0200
+@@ -14,7 +14,7 @@
+ setdocktype=1
+ setpartialstrut=1
+ usefontcolor=0
+- fontcolor=#ffffff
++ fontcolor=#000000
+ usefontsize=0
+ fontsize=10
+ background=0
+@@ -33,6 +33,7 @@
+ Config {
+ Button1=iconify
+ Button2=shade
++ Toggle=1
+ }
+ }
+
+diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/top.in lxpanel-0.5.9/data/two_panels/panels/top.in
+--- lxpanel-0.5.9.orig/data/two_panels/panels/top.in 2012-04-08 01:27:42.000000000 +0200
++++ lxpanel-0.5.9/data/two_panels/panels/top.in 2012-06-10 19:13:06.529349244 +0200
+@@ -14,7 +14,7 @@
+ setdocktype=1
+ setpartialstrut=1
+ usefontcolor=0
+- fontcolor=#ffffff
++ fontcolor=#000000
+ usefontsize=0
+ fontsize=10
+ background=0
+@@ -31,19 +31,20 @@
+ Plugin {
+ type = menu
+ Config {
+- image = @prefix@/share/lxpanel/images/my-computer.svg
++ image=@prefix@/share/lxpanel/images/my-computer.png
+ system {
+ }
+ separator {
+ }
+ item {
+- command = run
++ image=system-run
++ command=run
+ }
+ separator {
+ }
+ item {
+- image = gnome-logout
+- command = logout
++ image=system-log-out
++ command=logout
+ }
+ }
+ }
+@@ -52,10 +53,10 @@
+ type = launchbar
+ Config {
+ Button {
+- id=pcmanfm.desktop
++ id=fedora-pcmanfm.desktop
+ }
+ Button {
+- id=gnome-terminal.desktop
++ id=fedora-lxterminal.desktop
+ }
+ Button {
+ id=firefox.desktop
diff --git a/lxpanel-0.5.9-dsofix.patch b/lxpanel-0.5.9-dsofix.patch
new file mode 100644
index 0000000..a606b57
--- /dev/null
+++ b/lxpanel-0.5.9-dsofix.patch
@@ -0,0 +1,11 @@
+--- lxpanel-0.5.9.orig/src/Makefile.in 2012-04-16 22:24:10.000000000 +0200
++++ lxpanel-0.5.9/src/Makefile.in 2012-06-07 23:37:24.448841740 +0200
+@@ -239,7 +239,7 @@
+ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lgmodule-2.0
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/lxpanel.spec b/lxpanel.spec
index 98bba9e..9f240a6 100644
--- a/lxpanel.spec
+++ b/lxpanel.spec
@@ -1,33 +1,43 @@
-# Review Request:
-# https://bugzilla.redhat.com/show_bug.cgi?id=219930
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=219930
Name: lxpanel
-Version: 0.5.8
-Release: 2%{?dist}
+Version: 0.5.9
+Release: 1%{?dist}
Summary: A lightweight X11 desktop panel
Group: User Interface/Desktops
License: GPLv2+
URL: http://lxde.org/
+#VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxinput
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+
# https://bugzilla.redhat.com/show_bug.cgi?id=564746
-Patch0: lxpanel-0.5.5-dsofix.patch
-# distro specific patches
-Patch100: lxpanel-0.5.4-default.patch
+Patch0: lxpanel-0.5.9-dsofix.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=746063
+Patch1: lxpanel-0.5.6-Fix-pager-scroll.patch
+
+## distro specific patches
+# default configuration
+Patch100: lxpanel-0.5.9-default.patch
+# use nm-connection-editor to edit network connections
Patch101: lxpanel-0.3.8.1-nm-connection-editor.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildRequires: docbook-utils
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: intltool
-BuildRequires: libXpm-devel
-BuildRequires: startup-notification-devel
+BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(libstartup-notification-1.0)
# required for alsa mixer plugin
-BuildRequires: alsa-lib-devel
+BuildRequires: pkgconfig(alsa)
# required for netstatus plugin
BuildRequires: wireless-tools-devel
-BuildRequires: menu-cache-devel >= 0.3.0
+BuildRequires: pkgconfig(libmenu-cache) >= 0.3.0
+BuildRequires: pkgconfig(libwnck-1.0)
+
%description
lxpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM
@@ -49,6 +59,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .dsofix
+%patch1 -p1 -b .revert
%patch100 -p1 -b .default
%patch101 -p1 -b .system-config-network
@@ -56,7 +67,7 @@ developing applications that use %{name}.
%build
%configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
@@ -83,6 +94,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/lxpanel.pc
%changelog
+* Wed Jun 07 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.9-1
+- Update to 0.5.9 (#827779)
+- Fix the netstat plugin (#750400)
+- Correctly show 'Application launch bar' settings window (#830198)
+- Reverse scrolling direction in workspace switcher (#746063)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 64d0880..de5d76f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-129fae75d1cd3983fd94542c573a70a1 lxpanel-0.5.8.tar.gz
+232eb7cfed03d126715ddccdf3a4d0ea lxpanel-0.5.9.tar.gz
More information about the scm-commits
mailing list