rpms/xfce4-panel/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-panel-4.4.2-defaults.patch, 1.4, 1.5 xfce4-panel.spec, 1.27, 1.28

Christoph Wickert cwickert at fedoraproject.org
Mon Oct 27 21:29:46 UTC 2008 

Author: cwickert

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

Modified Files:
	.cvsignore sources xfce4-panel-4.4.2-defaults.patch 
	xfce4-panel.spec 
Log Message:
* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
- Update to 4.4.3
- Remove mailwatch-plugin from default panel config again
- BuildRequire intltool
- Update gtk-update-icon-cache scriptlets
- Fix BuildRoot tag



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Dec 2007 05:13:45 -0000	1.9
+++ .cvsignore	27 Oct 2008 21:29:16 -0000	1.10
@@ -1 +1 @@
-xfce4-panel-4.4.2.tar.bz2
+xfce4-panel-4.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Dec 2007 05:13:45 -0000	1.9
+++ sources	27 Oct 2008 21:29:16 -0000	1.10
@@ -1 +1 @@
-8f26b32c442bf9926f98f285a3c251dd  xfce4-panel-4.4.2.tar.bz2
+06ef9294062f9bdee4106772e62802f5  xfce4-panel-4.4.3.tar.bz2

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-panel-4.4.2-defaults.patch	2 Oct 2008 01:46:44 -0000	1.4
+++ xfce4-panel-4.4.2-defaults.patch	27 Oct 2008 21:29:16 -0000	1.5
@@ -1,4 +1,3 @@
-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 @@
@@ -6,16 +5,16 @@
  
  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 mailwatch-22.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 mailwatch-22.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)
+ 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
@@ -25,8 +24,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 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)
++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:
@@ -42,25 +41,6 @@
  		</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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xfce4-panel.spec	2 Oct 2008 00:55:57 -0000	1.27
+++ xfce4-panel.spec	27 Oct 2008 21:29:16 -0000	1.28
@@ -1,18 +1,17 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.4.2
-Release: 5%{?dist}
+Version: 4.4.3
+Release: 1%{?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
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: libxfcegui4 >= %{version}
 Requires: libxfce4mcs >= %{version}
 Requires: xfce-mcs-manager >= %{version}
-Requires: libxml2 >= 2.4.0
 Requires: Terminal
 Requires: mousepad
 BuildRequires: libxfcegui4-devel >= %{version}
@@ -22,7 +21,7 @@
 BuildRequires: startup-notification-devel
 BuildRequires: imake
 BuildRequires: libXt-devel
-BuildRequires: gettext
+BuildRequires: gettext intltool
 # xfce4-iconbox isn't in Xfce 4.4
 Provides: xfce4-iconbox = %{version}-%{release}
 Obsoletes: xfce4-iconbox <= 4.2.3-4.fc6
@@ -53,8 +52,8 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: libxfce4util-devel = %{version}
-Requires: libxfcegui4-devel = %{version}
+Requires: libxfce4util-devel >= %{version}
+Requires: libxfcegui4-devel >= %{version}
 
 %description devel
 This package includes the header files you will need to build
@@ -63,8 +62,8 @@
 %prep
 %setup -q
 
-%patch0 -p1 
-%patch1 -p1 
+%patch0 -p1 -b .multilib
+%patch1 -p1 -b .default
 
 %build
 %configure
@@ -79,6 +78,7 @@
 # remove useless dummy files
 rm -f $RPM_BUILD_ROOT/%{_bindir}/xfce4-iconbox
 rm -f $RPM_BUILD_ROOT/%{_bindir}/xftaskbar4
+# we need to own these dirs
 mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/panel-plugins
 %find_lang %{name}
@@ -87,13 +87,17 @@
 rm -rf $RPM_BUILD_ROOT
                                                                                           
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -123,6 +127,13 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
+- Update to 4.4.3
+- Remove mailwatch-plugin from default panel config again
+- BuildRequire intltool
+- Update gtk-update-icon-cache scriptlets
+- Fix BuildRoot tag
+
 * Thu Oct 02 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.2-5
 - Fix FTBFS (#465058)
 - Update defaults patch to include mailwatch plugin

More information about the scm-commits mailing list