rpms/xfce4-panel/devel xfce4-panel-4.4.2-defaults.patch, NONE, 1.1 xfce4-panel.spec, 1.25, 1.26

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7672

Modified Files:
	xfce4-panel.spec 
Added Files:
	xfce4-panel-4.4.2-defaults.patch 
Log Message:
Add defaults patch. See bug 433573


xfce4-panel-4.4.2-defaults.patch:

--- NEW FILE xfce4-panel-4.4.2-defaults.patch ---
--- xfce4-panel-4.4.2.orig/config/Makefile.am   2007-11-17 20:30:59.000000000 +0100
+++ xfce4-panel-4.4.2/config/Makefile.am        2008-02-19 23:45:57.000000000 +0100
@@ -7,12 +7,12 @@
 conf_files = $(conf_in_files:.rc.in=.rc)
 
 confdir = $(sysconfdir)/xdg/xfce4/panel
-conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files)
+conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_files)
 
 # copied from INTLTOOL_DESKTOP_RULE
 %.rc:   %.rc.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files)
+EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_in_files)
 
 distclean-local:
        rm -f $(conf_files)
diff -Nur xfce4-panel-4.4.2.orig/config/Makefile.in xfce4-panel-4.4.2/config/Makefile.in
--- xfce4-panel-4.4.2.orig/config/Makefile.in   2007-11-17 20:46:03.000000000 +0100
+++ xfce4-panel-4.4.2/config/Makefile.in        2008-02-19 23:53:10.000000000 +0100
@@ -253,8 +253,8 @@
 
 conf_files = $(conf_in_files:.rc.in=.rc)
 confdir = $(sysconfdir)/xdg/xfce4/panel
-conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files)
-EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files)
+conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_files)
+EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc $(conf_in_files)
 all: all-am
 
 .SUFFIXES:
diff -Nur xfce4-panel-4.4.2.orig/config/panels.xml xfce4-panel-4.4.2/config/panels.xml
--- xfce4-panel-4.4.2.orig/config/panels.xml	2007-11-17 20:30:59.000000000 +0100
+++ xfce4-panel-4.4.2/config/panels.xml	2008-02-19 23:12:03.000000000 +0100
@@ -19,6 +19,8 @@
 			<item name="pager" id="2"/>
 			<item name="tasklist" id="3"/>
 			<item name="systray" id="4"/>
+			<item name="xfce4-mixer" id="20"/>
+			<item name="thunar-tpa" id="21"/>
 		</items>
 	</panel>
 	<panel>
diff -Nur xfce4-panel-4.4.2.orig/config/xfce4-mixer-20.rc xfce4-panel-4.4.2/config/xfce4-mixer-20.rc
--- xfce4-panel-4.4.2.orig/config/xfce4-mixer-20.rc	1970-01-01 01:00:00.000000000 +0100
+++ xfce4-panel-4.4.2/config/xfce4-mixer-20.rc	2008-02-19 23:04:21.000000000 +0100
@@ -0,0 +1,7 @@
+[mixer-plugin]
+LauncherRunInTerminal=false
+LauncherUseStartupNotification=false
+Device=default
+LauncherCommand=xfce4-mixer
+MasterControl=Front,0
+


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xfce4-panel.spec	24 Feb 2008 05:23:05 -0000	1.25
+++ xfce4-panel.spec	9 Apr 2008 01:51:35 -0000	1.26
@@ -1,11 +1,12 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce4-panel-4.4.2.tar.bz2
 Patch0: xfce4-panel-4.4.1-multilib.patch
+Patch1: xfce4-panel-4.4.2-defaults.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= %{version}
@@ -63,6 +64,7 @@
 %setup -q
 
 %patch0 -p1 
+%patch1 -p1 
 
 %build
 %configure
@@ -104,6 +106,7 @@
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-7.rc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/systray-4.rc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-8.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-mixer-20.rc
 
 %{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/panel-plugins/
@@ -124,6 +127,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Tue Apr 08 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
+- Add defaults patch. See bug 433573
+
 * Sat Feb 23 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-3
 - Drop dependency on xfce-icon-theme. See bug 433152