rpms/xfce4-panel/devel xfce4-panel-4.4.2-defaults.patch, 1.2, 1.3 xfce4-panel.spec, 1.26, 1.27

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22164

Modified Files:
	xfce4-panel-4.4.2-defaults.patch xfce4-panel.spec 
Log Message:
* Thu Oct 02 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.2-5
- Fix FTBFS (#465058)
- Update defaults patch to include mailwatch plugin
- Remove old xfce4-iconbox and xftaskbar dummy files


xfce4-panel-4.4.2-defaults.patch:

Index: xfce4-panel-4.4.2-defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel-4.4.2-defaults.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-panel-4.4.2-defaults.patch	30 Aug 2008 22:33:59 -0000	1.2
+++ xfce4-panel-4.4.2-defaults.patch	2 Oct 2008 00:55:57 -0000	1.3
@@ -1,3 +1,4 @@
+diff -Nur xfce4-panel-4.4.2.orig/config/Makefile.am xfce4-panel-4.4.2/config/Makefile.am
 --- 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 @@
@@ -5,13 +6,13 @@
  
  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)
++conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc mailwatch-22.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)
++EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc mailwatch-22.rc $(conf_in_files)
  
  distclean-local:	
  	rm -f $(conf_files)
@@ -24,8 +25,8 @@
  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)
++conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc mailwatch-22.rc $(conf_files)
++EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc xfce4-mixer-20.rc mailwatch-22.rc $(conf_in_files)
  all: all-am
  
  .SUFFIXES:
@@ -41,6 +42,25 @@
  		</items>
  	</panel>
  	<panel>
+@@ -41,6 +43,7 @@
+ 			<item name="launcher" id="8"/>
+ 			<item name="launcher" id="9"/>
+ 			<item name="launcher" id="10"/>
++			<item name="mailwatch" id="22"/>
+ 			<item name="separator" id="11"/>
+ 			<item name="actions" id="12"/>
+ 			<item name="separator" id="13"/>
+diff -Nur xfce4-panel-4.4.2.orig/config/mailwatch-22.rc xfce4-panel-4.4.2/config/mailwatch-22.rc
+--- xfce4-panel-4.4.2.orig/config/mailwatch-22.rc	1970-01-01 01:00:00.000000000 +0100
++++ xfce4-panel-4.4.2/config/mailwatch-22.rc	2008-10-02 00:47:29.000000000 +0200
+@@ -0,0 +1,7 @@
++[mailwatch-plugin]
++click_command=exo-open --launch MailReader
++new_messages_command=
++normal_icon=xfce-nomail
++new_mail_icon=xfce-newmail
++log_lines=200
++show_log_status=true
 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


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xfce4-panel.spec	9 Apr 2008 01:51:35 -0000	1.26
+++ xfce4-panel.spec	2 Oct 2008 00:55:57 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
 Version: 4.4.2
-Release: 4%{?dist}
+Release: 5%{?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
@@ -76,6 +76,9 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+# remove useless dummy files
+rm -f $RPM_BUILD_ROOT/%{_bindir}/xfce4-iconbox
+rm -f $RPM_BUILD_ROOT/%{_bindir}/xftaskbar4
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/panel-plugins
 %find_lang %{name}
@@ -98,15 +101,8 @@
 %doc README ChangeLog NEWS COPYING AUTHORS
 %dir %{_sysconfdir}/xdg/xfce4/
 %dir %{_sysconfdir}/xdg/xfce4/panel/
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/*.rc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-menu-5.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-9.rc
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/clock-14.rc
-%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/
@@ -127,6 +123,11 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Oct 02 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.2-5
+- Fix FTBFS (#465058)
+- Update defaults patch to include mailwatch plugin
+- Remove old xfce4-iconbox and xftaskbar dummy files
+
 * Tue Apr 08 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
 - Add defaults patch. See bug 433573