rpms/xfdesktop/EL-5 xfdesktop-4.5.92-backdrop-image.patch, NONE, 1.1 xfdesktop-4.5.92-desktop-menu-icon.patch, NONE, 1.1 xfdesktop-4.6.0-redhat-menus.patch, NONE, 1.1 xfdesktop-4.6.1-education-menu-icon.patch, NONE, 1.1 xfdesktop-4.6.2-dsofix.patch, NONE, 1.1 sources, 1.8, 1.9 xfdesktop.spec, 1.18, 1.19
Kevin Fenzi
kevin at fedoraproject.org
Mon Jul 26 15:33:33 UTC 2010
Author: kevin
Update of /cvs/pkgs/rpms/xfdesktop/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19020
Modified Files:
sources xfdesktop.spec
Added Files:
xfdesktop-4.5.92-backdrop-image.patch
xfdesktop-4.5.92-desktop-menu-icon.patch
xfdesktop-4.6.0-redhat-menus.patch
xfdesktop-4.6.1-education-menu-icon.patch
xfdesktop-4.6.2-dsofix.patch
Log Message:
initial version for epel5
xfdesktop-4.5.92-backdrop-image.patch:
xfdesktop-common.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE xfdesktop-4.5.92-backdrop-image.patch ---
diff -Nur xfdesktop-4.5.92.orig/common/xfdesktop-common.h xfdesktop-4.5.92/common/xfdesktop-common.h
--- xfdesktop-4.5.92.orig/common/xfdesktop-common.h 2008-10-14 01:33:41.000000000 -0600
+++ xfdesktop-4.5.92/common/xfdesktop-common.h 2008-12-30 16:45:55.000000000 -0700
@@ -31,7 +31,8 @@
#include <X11/Xlib.h>
#define XFDESKTOP_CHANNEL "xfce4-desktop"
-#define DEFAULT_BACKDROP DATADIR "/xfce4/backdrops/xfce-stripes.png"
+/* Use distribution's default background image */
+#define DEFAULT_BACKDROP DATADIR "/backgrounds/images/default.jpg"
#define DEFAULT_BACKDROP_LIST "xfce4/desktop/backdrop.list"
#define DEFAULT_ICON_FONT_SIZE 12
#define DEFAULT_ICON_SIZE 32
xfdesktop-4.5.92-desktop-menu-icon.patch:
desktop-menu-plugin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xfdesktop-4.5.92-desktop-menu-icon.patch ---
diff -Nur xfdesktop-4.5.92.orig/panel-plugin/desktop-menu-plugin.c xfdesktop-4.5.92/panel-plugin/desktop-menu-plugin.c
--- xfdesktop-4.5.92.orig/panel-plugin/desktop-menu-plugin.c 2008-10-14 01:33:42.000000000 -0600
+++ xfdesktop-4.5.92/panel-plugin/desktop-menu-plugin.c 2008-12-30 16:51:18.000000000 -0700
@@ -62,7 +62,7 @@
#include "xfce4-popup-menu.h"
#define BORDER 8
-#define DEFAULT_BUTTON_ICON DATADIR "/pixmaps/xfce4_xicon1.png"
+#define DEFAULT_BUTTON_ICON "xfce4_xicon1"
#define DEFAULT_BUTTON_TITLE "Xfce Menu"
/* this'll only allow one copy of the plugin; useful for forcing the
xfdesktop-4.6.0-redhat-menus.patch:
xfce-applications.menu | 57 +++++++++++++++++++++++++++++++++----------------
1 file changed, 39 insertions(+), 18 deletions(-)
--- NEW FILE xfdesktop-4.6.0-redhat-menus.patch ---
--- xfdesktop-4.6.0.orig/modules/menu/menu-data/xfce-applications.menu 2009-01-12 23:03:21.000000000 +0100
+++ xfdesktop-4.6.0/modules/menu/menu-data/xfce-applications.menu 2009-04-13 21:36:32.000000000 +0200
@@ -18,7 +18,8 @@
<Filename>xfce4-file-manager.desktop</Filename>
<Filename>xfce4-web-browser.desktop</Filename>
<Separator/>
- <Menuname>Settings</Menuname>
+ <Menuname>Preferences</Menuname>
+ <Menuname>Administration</Menuname>
<Separator/>
<Merge type="all"/>
<Separator/>
@@ -28,10 +29,16 @@
</Layout>
<Menu>
- <Name>Settings</Name>
- <Directory>xfce-settings.directory</Directory>
+ <Name>Preferences</Name>
+ <Directory>Settings.directory</Directory>
<Include>
- <Category>Settings</Category>
+ <And>
+ <Category>Settings</Category>
+ <Not><Category>System</Category></Not>
+ <Not><Category>Screensaver</Category></Not>
+ <Not><Filename>fedora-im-chooser.desktop</Filename></Not>
+ <Not><Filename>gnome-default-applications.desktop</Filename></Not>
+ </And>
</Include>
<Layout>
@@ -40,25 +47,29 @@
<Merge type="all"/>
</Layout>
- <Menu>
- <Name>Screensavers</Name>
- <Directory>xfce-screensavers.directory</Directory>
- <Include>
- <Category>Screensaver</Category>
- </Include>
- </Menu>
+ </Menu>
+
+ <Menu>
+ <Name>Administration</Name>
+ <Directory>SystemConfig.directory</Directory>
+ <Include>
+ <And>
+ <Category>Settings</Category>
+ <Category>System</Category>
+ <Not><Category>Screensaver</Category></Not>
+ </And>
+ </Include>
+
</Menu>
<Menu>
<Name>Accessories</Name>
<Directory>xfce-accessories.directory</Directory>
<Include>
- <Or>
- <Category>Accessibility</Category>
- <Category>Core</Category>
- <Category>Legacy</Category>
+ <And>
<Category>Utility</Category>
- </Or>
+ <Not><Category>System</Category></Not>
+ </And>
</Include>
</Menu>
@@ -124,7 +135,11 @@
<Name>System</Name>
<Directory>xfce-system.directory</Directory>
<Include>
- <Category>System</Category>
+ <And>
+ <Category>System</Category>
+ <Not><Category>Settings</Category></Not>
+ <Not><Category>Screensaver</Category></Not>
+ </And>
</Include>
</Menu>
@@ -133,7 +148,13 @@
<Directory>xfce-other.directory</Directory>
<OnlyUnallocated/>
<Include>
- <All/>
+ <And>
+ <Not><Category>Core</Category></Not>
+ <Not><Category>Settings</Category></Not>
+ <Not><Category>SystemSetup</Category></Not>
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+ <Not><Category>Screensaver</Category></Not>
+ </And>
</Include>
</Menu>
xfdesktop-4.6.1-education-menu-icon.patch:
xfce-education.directory.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xfdesktop-4.6.1-education-menu-icon.patch ---
--- xfdesktop-4.6.0.orig/modules/menu/directory-data/xfce-education.directory.in 2009-01-12 23:03:19.000000000 +0100
+++ xfdesktop-4.6.0/modules/menu/directory-data/xfce-education.directory.in 2009-12-20 17:38:25.000000000 +0100
@@ -2,6 +2,6 @@
Version=1.0
Encoding=UTF-8
Type=Directory
-Icon=
+Icon=applications-science
_Name=Education
_Comment=Educational software
xfdesktop-4.6.2-dsofix.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xfdesktop-4.6.2-dsofix.patch ---
diff -Nur xfdesktop-4.6.2.orig/settings/Makefile.in xfdesktop-4.6.2/settings/Makefile.in
--- xfdesktop-4.6.2.orig/settings/Makefile.in 2010-05-21 11:01:41.000000000 -0600
+++ xfdesktop-4.6.2/settings/Makefile.in 2010-05-22 01:26:21.000000000 -0600
@@ -169,7 +169,7 @@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11
LIBEXO_CFLAGS = @LIBEXO_CFLAGS@
LIBEXO_LIBS = @LIBEXO_LIBS@
LIBEXO_REQUIRED_VERSION = @LIBEXO_REQUIRED_VERSION@
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 23 Apr 2007 02:49:29 -0000 1.8
+++ sources 26 Jul 2010 15:33:33 -0000 1.9
@@ -1 +1 @@
-7cbebc8e895eb19ee735e520ea48d03b xfdesktop-4.4.1.tar.bz2
+e800ea9fee7a5c5eaf2ae96e23a83e3a xfdesktop-4.6.2.tar.bz2
Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/EL-5/xfdesktop.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xfdesktop.spec 27 Aug 2007 21:37:16 -0000 1.18
+++ xfdesktop.spec 26 Jul 2010 15:33:33 -0000 1.19
@@ -1,33 +1,49 @@
Summary: Desktop manager for the XFce Desktop Environment
Name: xfdesktop
-Version: 4.4.1
-Release: 3%{?dist}
+Version: 4.6.2
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfdesktop-4.4.1.tar.bz2
+Source0: http://archive.xfce.org/src/xfce/xfdesktop/4.6/xfdesktop-%{version}.tar.bz2
-# Change default for Fedora
-Patch0: xfdesktop-image-4.3.90.1.patch
+# Change default background for Fedora
+Patch0: xfdesktop-4.5.92-backdrop-image.patch
+# Enable distro specific logo in desktop menu
+Patch1: xfdesktop-4.5.92-desktop-menu-icon.patch
+# Use redhat-menus to avoid duplicate entries in the menu
+Patch2: xfdesktop-4.6.0-redhat-menus.patch
+# fix icon in xfce-education.directory, taken from
+# http://git.xfce.org/xfce/xfdesktop/commit/?id=c2de873891d8ce8c3be1399c6110ebfda489151b
+Patch3: xfdesktop-4.6.1-education-menu-icon.patch
+# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6235
+Patch4: xfdesktop-4.6.2-dsofix.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: xfce-mcs-manager
Requires: xfwm4
Requires: xfce4-panel
+Requires: xfce4-doc
+Requires: redhat-menus
+%if 0%{?fedora} <= 9
Requires: desktop-backgrounds-basic
-BuildRequires: libxfce4mcs-devel >= %{version}
+%else
+Requires: desktop-backgrounds-compat
+%endif
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: xfce4-panel-devel >= %{version}
BuildRequires: libxml2-devel
-BuildRequires: xfce-mcs-manager-devel
-BuildRequires: imake
-BuildRequires: libXt-devel
BuildRequires: gettext
BuildRequires: exo-devel
BuildRequires: Thunar-devel
BuildRequires: dbus-glib-devel
BuildRequires: dbus-devel
+BuildRequires: libwnck-devel
+BuildRequires: libglade2-devel
+BuildRequires: libxfce4menu-devel
+BuildRequires: xfconf-devel
+BuildRequires: intltool
+BuildRequires: libSM-devel
%description
This package includes a desktop manager for the XFce Desktop Environment.
@@ -35,7 +51,11 @@ This package includes a desktop manager
%prep
%setup -q
-%patch0 -p1 -b .fedora
+%patch0 -p1 -b .backdrop
+%patch1 -p1 -b .distro-logo
+%patch2 -p1 -b .orig
+%patch3 -p1 -b .icon
+%patch4 -p1 -b .dsofix
%build
%configure
@@ -45,7 +65,7 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
@@ -56,35 +76,114 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/
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 &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README TODO ChangeLog NEWS COPYING AUTHORS
-%{_sysconfdir}/xdg/xfce4/*
%{_bindir}/*
-%{_libdir}/xfce4/mcs-plugins/*
%{_libexecdir}/xfce4/panel-plugins/*
%{_libdir}/xfce4/modules/
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/pixmaps/*
-%{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
-%{_datadir}/xfce4/doc
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
%{_datadir}/xfce4/backdrops
-%{_datadir}/xfce4-menueditor/
%{_mandir}/man1/*
+%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
+%{_datadir}/desktop-directories/*
+%{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
%changelog
+* Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.2-1
+- Update to 4.6.2
+
+* Sat Apr 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-6
+- Adjustments for recent Goddard artwork changes
+
+* Sun Feb 14 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
+- Add patch for DSO linking. Fixes bug #564826
+
+* Sun Dec 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
+- Menu fixes
+
+* Sun Nov 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
+- Fix dependency for default background image
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
+- Update to 4.6.1
+
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-4
+- Exclude gnome-default-applications from menu to avoid duplicates (#488558)
+
+* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-3
+- Fix directory ownership problems
+- Require xfce4-doc and redhat-menus
+- Tweak and clean up Xfce menu
+
+* Fri Feb 27 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-2
+- Add libSM-devel to BuildRequires
+
+* Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
+- Update to 4.6.0
+- Remove unneeded BuildRequires
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.5.99.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sun Dec 28 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update 4.5.92
+
+* Sun Aug 31 2008 Christoph Wickert <fedora at christoph-wickert.de> - 4.4.2-6
+- Update xdg-userdir-compat.patch to use upstream's variable names
+
+* Wed Aug 27 2008 Christoph Wickert <fedora at christoph-wickert.de> - 4.4.2-5
+- Use Fedora icon for desktop menu plugin (#445986)
+- Respect xdg user directory paths (#457740)
+- Fix menu icons
+- Fix CRITICAL register message on startup
+- Fix for x86_64
+- Simplify g_list_free code
+
+* Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
+- Add partial memory leak patch (partially fixes #428662)
+
+* Tue Feb 19 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-3
+- Rebuild for gcc43
+- Add patch for gcc43
+
+* Mon Dec 17 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.2-2
+- Apply patch to show default backdrop
+
+* Sun Nov 18 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.2-1
+- Update to 4.4.2
+
* Mon Aug 27 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-3
- Update License tag
- Update patch to have correct desktop image filename
+* Tue Jul 9 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-2
+- Add patch to fix menu lockups with new gtk2
+
* Wed Apr 11 2007 Kevin Fenzi <kevin at tummy.com> - 4.4.1-1
- Update to 4.4.1
More information about the scm-commits
mailing list