[xfdesktop] - Update to 4.7.5

[Christoph Wickert]

commit b7427f88e8a30b6311b0f84c2c5f6618c77e69f1
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jan 8 23:23:54 2011 +0100

    - Update to 4.7.5

 .gitignore     |    1 +
 sources        |    2 +-
 xfdesktop.spec |  120 ++++++++++++++++++++++++++++++-------------------------
 3 files changed, 67 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57aac63..399b685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfdesktop-4.6.2.tar.bz2
+/xfdesktop-4.7.5.tar.bz2
diff --git a/sources b/sources
index 22cc183..d542aaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e800ea9fee7a5c5eaf2ae96e23a83e3a  xfdesktop-4.6.2.tar.bz2
+ae6c2b1d0f43a294bf409ec0332352a4  xfdesktop-4.7.5.tar.bz2
diff --git a/xfdesktop.spec b/xfdesktop.spec
index a9d1195..7809299 100644
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -1,61 +1,56 @@
-Summary: Desktop manager for the XFce Desktop Environment
-Name: xfdesktop
-Version: 4.6.2
-Release: 3%{?dist}
-License: GPLv2+
-URL: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/xfce/xfdesktop/4.6/xfdesktop-%{version}.tar.bz2
+%global xfceversion 4.7
 
+Name:           xfdesktop
+Version:        4.7.5
+Release:        1%{?dist}
+Summary:        Desktop manager for the XFce Desktop Environment
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://www.xfce.org/
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 # 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: xfwm4
-Requires: xfce4-panel
-Requires: xfce4-doc
-Requires: redhat-menus
+Patch0:         xfdesktop-4.5.92-backdrop-image.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxfce4ui-devel >= %{version}
+BuildRequires:  xfce4-panel-devel >= %{version}
+BuildRequires:  libxml2-devel
+BuildRequires:  gettext
+BuildRequires:  exo-devel
+BuildRequires:  Thunar-devel
+BuildRequires:  dbus-glib-devel
+BuildRequires:  dbus-devel
+BuildRequires:  garcon-devel
+BuildRequires:  libwnck-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  libnotify-devel
+BuildRequires:  libxfce4menu-devel
+BuildRequires:  xfconf-devel
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
+BuildRequires:  libSM-devel
+BuildRequires:  libICE-devel
+Requires:       xfwm4
+Requires:       xfce4-panel
+Requires:       xfce4-doc
+Requires:       redhat-menus
 %if 0%{?fedora} <= 9
-Requires: desktop-backgrounds-basic
+Requires:       desktop-backgrounds-basic
 %else
-Requires: desktop-backgrounds-compat
+Requires:       desktop-backgrounds-compat
 %endif
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: xfce4-panel-devel >= %{version}
-BuildRequires: libxml2-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.
 
+
 %prep
 %setup -q
 
 %patch0 -p1 -b .backdrop
-%patch1 -p1 -b .distro-logo
-%patch2 -p1 -b .orig
-%patch3 -p1 -b .icon
-%patch4 -p1 -b .dsofix
+
 
 %build
 %configure
@@ -67,45 +62,60 @@ rm -rf $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
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+desktop-file-validate \
+    $RPM_BUILD_ROOT/%{_datadir}/applications/xfce-backdrop-settings.desktop
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %postun
 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
+%doc %{_docdir}/%{name}/
 %{_bindir}/*
-%{_libexecdir}/xfce4/panel-plugins/*
-%{_libdir}/xfce4/modules/
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/pixmaps/*
-%doc %{_datadir}/xfce4/doc/*/images/*
-%doc %{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfce4/backdrops
 %{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
-%{_datadir}/desktop-directories/*
-%{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
+
 
 %changelog
-* Wed Sep 29 2010 jkeating - 4.6.2-3
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.5-1
+- Update to 4.7.5
+
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+- Drop libnotify fix (upstreamed)
+
+* Sat Dec 04 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+- Fix for libnotify 0.7.0 (bugzilla.xfce.org #6915)
+
+* Sat Nov 13 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
+* Wed Sep 29 2010 Jesse Keating <jkeating at fedpraproject.org> - 4.6.2-3
 - Rebuilt for gcc bug 634757
 
 * Sun Sep 19 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.2-2