[xfwm4] - Update to 4.7.4 - Update icon-cache scriptlets

[Christoph Wickert]

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

    - Update to 4.7.4
    - Update icon-cache scriptlets

 .gitignore               |    1 +
 sources                  |    2 +-
 xfwm4-4.6.1-dsofix.patch |   12 ------
 xfwm4.spec               |  100 +++++++++++++++++++++++++++------------------
 4 files changed, 62 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d812c9..0fcb040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfwm4-4.6.2.tar.bz2
+/xfwm4-4.7.4.tar.bz2
diff --git a/sources b/sources
index dcf0bba..fe2897a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e6c0c54b028b6ea60e865e55ecdf3f8  xfwm4-4.6.2.tar.bz2
+206fc123ee2010860e206fe0baa87f40  xfwm4-4.7.4.tar.bz2
diff --git a/xfwm4.spec b/xfwm4.spec
index 7ae1a1b..ba4fcf1 100644
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@ -1,30 +1,30 @@
-Summary: Next generation window manager for Xfce
-Name: xfwm4
-Version: 4.6.2
-Release: 3%{?dist}
-License: GPLv2+
-URL: http://www.xfce.org/
-Source0: http://archive.xfce.org/src/xfce/xfwm4/4.6/xfwm4-%{version}.tar.bz2
-Patch0: xfwm4-4.6.1-nodoka.patch
-# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6231
-Patch3: xfwm4-4.6.1-dsofix.patch
-
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires: libxfcegui4 >= %{version}
-Requires: xfce4-doc
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libXext-devel
-BuildRequires: gettext intltool
-BuildRequires: libXcomposite-devel
-BuildRequires: libXdamage-devel
-BuildRequires: startup-notification-devel
-BuildRequires: libglade2-devel
-BuildRequires: libwnck-devel
-BuildRequires: xfconf-devel
-BuildRequires: desktop-file-utils
-Provides: firstboot(windowmanager)
+%global xfceversion 4.7
+
+Name:           xfwm4
+Version:        4.7.4
+Release:        1%{?dist}
+Summary:        Next generation window manager for Xfce
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://www.xfce.org/
+Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+Patch0:         xfwm4-4.6.1-nodoka.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+BuildRequires:  libXext-devel
+BuildRequires:  gettext 
+BuildRequires:  intltool
+BuildRequires:  libXcomposite-devel
+BuildRequires:  libXdamage-devel
+BuildRequires:  startup-notification-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  libwnck-devel
+BuildRequires:  xfconf-devel >= %{xfceversion}
+BuildRequires:  desktop-file-utils
+# FIXME
+#Requires:       xfce4-doc
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -33,13 +33,14 @@ xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
 %setup -q
 # use Nodoka Theme
 %patch0 -p1 -b .nodoka
-%patch3 -p1 -b .dsofix
+
 
 %build
 %configure  --disable-static
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
@@ -50,38 +51,57 @@ for file in $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop; do
   desktop-file-validate $file
 done
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_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 example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
+%doc %{_docdir}/%{name}
 %{_bindir}/xfwm4
 %{_bindir}/xfwm4-settings
 %{_bindir}/xfwm4-tweaks-settings
 %{_bindir}/xfwm4-workspace-settings
-%{_datadir}/applications/*
+%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-%doc %{_datadir}/xfce4/doc/*/images/*
-%doc %{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfwm4
 %{_datadir}/themes/*
-%{_libexecdir}/xfce4/xfwm4
+%dir %{_libdir}/xfce4/xfwm4/
+%{_libdir}/xfce4/xfwm4/helper-dialog
+
 
 %changelog
-* Wed Sep 29 2010 jkeating - 4.6.2-3
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+- Update icon-cache scriptlets
+
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+
+* Mon Nov 29 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.7.1-1
+- Update to 4.7.1
+
+* Wed Sep 29 2010 Jesse Keating <jkeating at fedoraproject.org> - 4.6.2-3
 - Rebuilt for gcc bug 634757
 
 * Sun Sep 19 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.2-2