- merged from DEVEL, update icon cache

Changed files:
    xfwm4.spec -> 1.45

diff --git a/xfwm4.spec b/xfwm4.spec
index f4d628436c013f96eec5c3b0a29390b99abfa8de..5126d6d575a27f6de504b6fcc4a4283b34dd36d4 100644 (file)
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@ -1,44 +1,38 @@
-# TODO
-# - shouldn't own /usr/share/themes/Default?
-%bcond_without compositor              # without compositor extensions
-#
-%define                _xfce_ver       4.2.3
 Summary:       Next generation window manager for Xfce
 Summary(pl):   Zarz±dca okien nowej generacji dla Xfce
 Name:          xfwm4
-Version:       4.2.3.2
+Version:       4.3.90.2
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: d73e89c50179ccb438c076b3b71d59a4
+Source0:       http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 858dd3f2b430f338c7554d7e1a55d94a
 Patch0:                %{name}-locale-names.patch
 URL:           http://www.xfce.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2.2.0
-BuildRequires: intltool
+BuildRequires: gtk+2-devel >= 2:2.10.0
+BuildRequires: intltool >= 0.35
 BuildRequires: libtool
-BuildRequires: libxfce4mcs-devel >= %{_xfce_ver}
-BuildRequires: libxfcegui4-devel >= %{_xfce_ver}
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: startup-notification-devel >= 0.5
-BuildRequires: xfce-mcs-manager-devel >= %{_xfce_ver}
-BuildRequires: xfce4-dev-tools
+BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xfce-mcs-manager-devel >= %{version}
+BuildRequires: xfce4-dev-tools >= %{version}
 BuildRequires: xorg-lib-libXpm-devel
-Requires:      libxfce4mcs >= %{_xfce_ver}
-Requires:      libxfcegui4 >= %{_xfce_ver}
-Requires:      xfce-mcs-manager >= %{_xfce_ver}
+Requires(post,postun): gtk+2 >= 2:2.10.0
+Requires:      libxfce4mcs >= %{version}
+Requires:      libxfcegui4 >= %{version}
+Requires:      xfce-mcs-manager >= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3
-and Xfce.
+xfwm4 is a EWMH standard compliant window manager.
 
 %description -l pl
-xfwm4 to zarz±dca okien kompatybilny z GNOME, GNOME2, KDE2, KDE3 oraz
-Xfce.
+xfwm4 to zarz±dca okien zgodny ze standardem EWMH.
 
 %prep
 %setup -q
@@ -48,15 +42,15 @@ mv -f po/{pt_PT,pt}.po
 mv -f po/{nb_NO,nb}.po
 
 %build
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure %{?with_compositor:--enable-compositor}
-
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
+%configure
 %{__make}
 
 %install
@@ -74,6 +68,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.{la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO example.gtkrc-2.0
@@ -91,4 +91,4 @@ rm -rf $RPM_BUILD_ROOT
 # undermentioned dirs belong to xfce-mcs-manager
 %{_datadir}/xfce4/doc/C/*
 %lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(he) %{_datadir}/xfce4/doc/he/*
+%lang(it) %{_datadir}/xfce4/doc/it/*