rpms/xfce4-panel/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-panel-4.4.2-defaults.patch, 1.1, 1.2 xfce4-panel.spec, 1.26, 1.27

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-panel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31651

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/F-9/.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	26 Mar 2009 13:07:38 -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/F-9/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	26 Mar 2009 13:07:38 -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/F-9/xfce4-panel-4.4.2-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-panel-4.4.2-defaults.patch	9 Apr 2008 01:51:35 -0000	1.1
+++ xfce4-panel-4.4.2-defaults.patch	26 Mar 2009 13:07:38 -0000	1.2
@@ -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 @@
@@ -13,12 +14,12 @@
 -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)
+ 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 @@
+@@ -255,8 +255,8 @@
  
  conf_files = $(conf_in_files:.rc.in=.rc)
  confdir = $(sysconfdir)/xdg/xfce4/panel
@@ -50,5 +51,5 @@
 +LauncherUseStartupNotification=false
 +Device=default
 +LauncherCommand=xfce4-mixer
-+MasterControl=Front,0
++MasterControl=Master,0
 +


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/F-9/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	26 Mar 2009 13:07:38 -0000	1.27
@@ -1,18 +1,17 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.4.2
-Release: 4%{?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
@@ -76,6 +75,10 @@
 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
+# 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}
@@ -84,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
@@ -98,15 +105,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 +127,18 @@
 %{_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
+- 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