rpms/xfce4-panel/F-12 xfce4-panel-4.6.0-defaults.patch, 1.1, 1.2 xfce4-panel.spec, 1.40, 1.41
Christoph Wickert
cwickert at fedoraproject.org
Wed Sep 30 01:05:20 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/xfce4-panel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10586/F-12
Modified Files:
xfce4-panel-4.6.0-defaults.patch xfce4-panel.spec
Log Message:
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
- Add xfswitch-plugin to default panel config (#525563)
xfce4-panel-4.6.0-defaults.patch:
panels.xml | 2 ++
1 file changed, 2 insertions(+)
Index: xfce4-panel-4.6.0-defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-12/xfce4-panel-4.6.0-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfce4-panel-4.6.0-defaults.patch 27 Feb 2009 20:33:29 -0000 1.1
+++ xfce4-panel-4.6.0-defaults.patch 30 Sep 2009 01:05:20 -0000 1.2
@@ -1,60 +1,17 @@
-diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.am xfce4-panel-4.6.0/config/Makefile.am
---- xfce4-panel-4.6.0.orig/config/Makefile.am 2009-01-12 14:35:34.000000000 -0700
-+++ xfce4-panel-4.6.0/config/Makefile.am 2009-02-27 11:04:19.000000000 -0700
-@@ -17,6 +17,7 @@
- systray-4.rc \
- xfce4-menu-5.rc \
- clock-14.rc \
-+ xfce4-mixer-20.rc \
- $(conf_files)
-
- # copied from INTLTOOL_DESKTOP_RULE
-@@ -27,6 +28,7 @@
- systray-4.rc \
- xfce4-menu-5.rc \
- clock-14.rc \
-+ xfce4-mixer-20.rc \
- $(conf_in_files)
-
- distclean-local:
-diff -Nur xfce4-panel-4.6.0.orig/config/Makefile.in xfce4-panel-4.6.0/config/Makefile.in
---- xfce4-panel-4.6.0.orig/config/Makefile.in 2009-02-24 14:39:18.000000000 -0700
-+++ xfce4-panel-4.6.0/config/Makefile.in 2009-02-27 11:04:19.000000000 -0700
-@@ -279,6 +279,7 @@
- systray-4.rc \
- xfce4-menu-5.rc \
- clock-14.rc \
-+ xfce4-mixer-20.rc \
- $(conf_files)
-
- EXTRA_DIST = \
-@@ -286,6 +287,7 @@
- systray-4.rc \
- xfce4-menu-5.rc \
- clock-14.rc \
-+ xfce4-mixer-20.rc \
- $(conf_in_files)
-
- all: all-am
-diff -Nur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
+diff -dur xfce4-panel-4.6.0.orig/config/panels.xml xfce4-panel-4.6.0/config/panels.xml
--- xfce4-panel-4.6.0.orig/config/panels.xml 2009-02-24 14:14:35.000000000 -0700
+++ xfce4-panel-4.6.0/config/panels.xml 2009-02-27 11:07:35.000000000 -0700
-@@ -23,6 +23,8 @@
+@@ -23,11 +23,13 @@
<item name="launcher" id="10"/>
<item name="tasklist" id="3"/>
<item name="systray" id="4"/>
-+ <item name="xfce4-mixer" id="20"/>
+ <item name="thunar-tpa" id="21"/>
<item name="pager" id="2"/>
<item name="showdesktop" id="1"/>
<item name="separator" id="11"/>
-diff -Nur xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc xfce4-panel-4.6.0/config/xfce4-mixer-20.rc
---- xfce4-panel-4.6.0.orig/config/xfce4-mixer-20.rc 1969-12-31 17:00:00.000000000 -0700
-+++ xfce4-panel-4.6.0/config/xfce4-mixer-20.rc 2009-02-27 11:04:19.000000000 -0700
-@@ -0,0 +1,6 @@
-+[mixer-plugin]
-+LauncherRunInTerminal=false
-+LauncherUseStartupNotification=false
-+Device=default
-+LauncherCommand=xfce4-mixer
-+MasterControl=Master,0
+ <item name="clock" id="14"/>
+ <item name="separator" id="13"/>
++ <item name="xfswitch-plugin" id="20"/>
+ <item name="actions" id="12"/>
+ </items>
+ </panel>
Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-12/xfce4-panel.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xfce4-panel.spec 27 Jul 2009 07:54:34 -0000 1.40
+++ xfce4-panel.spec 30 Sep 2009 01:05:20 -0000 1.41
@@ -1,7 +1,7 @@
Summary: Next generation panel for Xfce
Name: xfce4-panel
Version: 4.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.xfce.org/
Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
@@ -127,6 +127,9 @@ fi
%{_includedir}/xfce4/libxfce4panel
%changelog
+* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Add xfswitch-plugin to default panel config (#525563)
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list