rpms/lxpanel/devel lxpanel-0.5.4-default.patch, NONE, 1.1 lxpanel-0.5.4-fix-ca.po.patch, NONE, 1.1 lxpanel-0.5.4-remove-cpufreq-from-configure.patch, NONE, 1.1 lxpanel.spec, 1.26, 1.27 lxpanel-default.patch, 1.7, NONE
Christoph Wickert
cwickert at fedoraproject.org
Sat Dec 12 01:27:18 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18391
Modified Files:
lxpanel.spec
Added Files:
lxpanel-0.5.4-default.patch lxpanel-0.5.4-fix-ca.po.patch
lxpanel-0.5.4-remove-cpufreq-from-configure.patch
Removed Files:
lxpanel-default.patch
Log Message:
* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
- Update to 0.5.4
- Restore toggle functionality of the show deskop plugin
lxpanel-0.5.4-default.patch:
panel.in | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE lxpanel-0.5.4-default.patch ---
--- lxpanel-0.5.4.orig/data/default/panels/panel.in 2009-04-20 17:07:32.000000000 +0200
+++ lxpanel-0.5.4/data/default/panels/panel.in 2009-12-12 02:18:21.000000000 +0100
@@ -50,13 +50,10 @@
type = launchbar
Config {
Button {
- id=pcmanfm.desktop
- }
- Button {
id=gnome-terminal.desktop
}
Button {
- id=firefox.desktop
+ id=mozilla-firefox.desktop
}
}
}
@@ -73,6 +70,7 @@
Config {
Button1=iconify
Button2=shade
+ Toggle=1
}
}
lxpanel-0.5.4-fix-ca.po.patch:
ca.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE lxpanel-0.5.4-fix-ca.po.patch ---
--- trunk/lxpanel/po/ca.po 2009/12/11 02:43:39 2188
+++ trunk/lxpanel/po/ca.po 2009/12/11 04:00:56 2189
@@ -417,7 +417,7 @@
#: ../src/panel.c:1356
#, c-format
msgid " --log <number> -- set log level 0-5. 0 - none 5 - chatty\n"
-msgstr " --log <nombre> -- defineix el nivell de registre 0-5. 0 - cap 5 - xerraire"
+msgstr " --log <nombre> -- defineix el nivell de registre 0-5. 0 - cap 5 - xerraire\n"
#. g_print(_(" --configure -- launch configuration utility\n"));
#: ../src/panel.c:1358
@@ -447,7 +447,7 @@
"\n"
"Visit http://lxde.org/ for detail.\n"
"\n"
-msgstr "Visiteu http://lxde.org/ per a més informació.\n"
+msgstr "\nVisiteu http://lxde.org/ per a més informació.\n"
#: ../src/gtk-run.c:312
msgid "Enter the command you want to execute:"
lxpanel-0.5.4-remove-cpufreq-from-configure.patch:
configure | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
--- NEW FILE lxpanel-0.5.4-remove-cpufreq-from-configure.patch ---
--- lxpanel-0.5.4.orig/configure 2009-12-10 19:46:47.000000000 +0100
+++ lxpanel-0.5.4/configure 2009-12-12 01:41:37.000000000 +0100
@@ -1595,7 +1595,7 @@
plugins may be comma separated
'all' builds all plugins (default), 'none' builds none
Possible plugins are:
- netstatus, volume, volumealsa, cpu, deskno, batt, kbled, xkb, thermal, cpufreq
+ netstatus, volume, volumealsa, cpu, deskno, batt, kbled, xkb, thermal
--with-x use the X Window System
--with-xml-catalog=CATALOG
path to xml catalog to use
@@ -11693,7 +11693,6 @@
plugin_xkb=
plugin_kbled=
plugin_thermal=
-plugin_cpufreq=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which plugins should be built dynamically" >&5
$as_echo_n "checking which plugins should be built dynamically... " >&6; }
@@ -11726,7 +11725,6 @@
plugin_kbled=kbled
plugin_xkb=xkb
plugin_thermal=thermal
- plugin_cpufreq=cpufreq
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: all" >&5
$as_echo "all" >&6; }
@@ -11763,9 +11761,6 @@
thermal)
plugin_thermal=thermal
;;
- cpufreq)
- plugin_cpufreq=cpufreq
- ;;
*)
echo "Unknown plugin $plugin."
exit 1
@@ -11795,8 +11790,7 @@
$plugin_batt \
$plugin_kbled \
$plugin_xkb \
- $plugin_thermal \
- $plugin_cpufreq"
+ $plugin_thermal"
@@ -13545,7 +13539,7 @@
fi
-ac_config_files="$ac_config_files lxpanel.pc Makefile src/Makefile src/plugins/Makefile src/plugins/netstatus/Makefile src/plugins/volume/Makefile src/plugins/volumealsa/Makefile src/plugins/cpu/Makefile src/plugins/deskno/Makefile src/plugins/batt/Makefile src/plugins/kbled/Makefile src/plugins/xkb/Makefile src/plugins/thermal/Makefile src/plugins/cpufreq/Makefile po/Makefile.in data/Makefile data/default/panels/panel man/Makefile"
+ac_config_files="$ac_config_files lxpanel.pc Makefile src/Makefile src/plugins/Makefile src/plugins/netstatus/Makefile src/plugins/volume/Makefile src/plugins/volumealsa/Makefile src/plugins/cpu/Makefile src/plugins/deskno/Makefile src/plugins/batt/Makefile src/plugins/kbled/Makefile src/plugins/xkb/Makefile src/plugins/thermal/Makefile po/Makefile.in data/Makefile data/default/panels/panel man/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -14550,7 +14544,6 @@
"src/plugins/kbled/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/kbled/Makefile" ;;
"src/plugins/xkb/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/xkb/Makefile" ;;
"src/plugins/thermal/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/thermal/Makefile" ;;
- "src/plugins/cpufreq/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/cpufreq/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/default/panels/panel") CONFIG_FILES="$CONFIG_FILES data/default/panels/panel" ;;
@@ -15974,10 +15967,6 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: thermal - Temperature monitor" >&5
$as_echo " thermal - Temperature monitor" >&6; }
fi
- if test x"$plugin_cpufreq" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: cpufreq - CpuFreq frontend" >&5
-$as_echo " cpufreq - CpuFreq frontend" >&6; }
- fi
else
echo Dynamic loader for plugins....... : disabled.
fi
Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- lxpanel.spec 9 Aug 2009 19:36:02 -0000 1.26
+++ lxpanel.spec 12 Dec 2009 01:27:18 -0000 1.27
@@ -4,7 +4,7 @@
#define _default_patch_fuzz 0
Name: lxpanel
-Version: 0.5.3
+Version: 0.5.4
Release: 1%{?dist}
Summary: A lightweight X11 desktop panel
@@ -12,15 +12,19 @@ Group: User Interface/Desktops
License: GPLv2+
URL: http://lxde.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
-Patch1: lxpanel-default.patch
-Patch3: lxpanel-0.3.8.1-nm-connection-editor.patch
+Patch0: lxpanel-0.5.4-default.patch
+Patch1: lxpanel-0.3.8.1-nm-connection-editor.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxpanel/po/ca.po?view=patch&r1=2189&r2=2188&pathrev=2189
+# without this build will fail due to an invalid po file
+Patch2: lxpanel-0.5.4-fix-ca.po.patch
+# without this one configure will break, because cpufreq plugin is no in the tarball
+Patch3: lxpanel-0.5.4-remove-cpufreq-from-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildRequires: docbook-utils
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: intltool
-#BuildRequires: libXmu-devel
BuildRequires: libXpm-devel
BuildRequires: startup-notification-devel
# required for alsa mixer plugin
@@ -40,7 +44,6 @@ 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
@@ -49,8 +52,10 @@ developing applications that use %{name}
%prep
%setup -q
-%patch1 -p1 -b .default
-%patch3 -p1 -b .system-config-network
+%patch0 -p1 -b .default
+%patch1 -p1 -b .system-config-network
+%patch2 -p2 -b .hosed
+%patch3 -p1 -b .cpufreq
%build
@@ -82,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/lxpanel.pc
%changelog
+* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
+- Update to 0.5.4
+- Restore toggle functionality of the show deskop plugin
+
* Thu Aug 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
- Update to 0.5.3, fixes vertical panel size (#515748)
--- lxpanel-default.patch DELETED ---
More information about the fedora-extras-commits
mailing list