- 2.14.3, use rpm macros

Changed files:
    gnome-panel.spec -> 1.172.2.4

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5f37c57c749a577db25681300aec14f9642f0a98..e4f275ed258e7cce6f009ead7e593feeb79d635a 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,12 +1,12 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.14.2
+Version:       2.14.3
 Release:       1
 License:       LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.14/%{name}-%{version}.tar.bz2
-# Source0-md5: 7db1afb3f6cbca12acecc49c68b4a655
+# Source0-md5: 14ab4c3d3ff3d0c1be397b6799a8626c
 Patch0:                %{name}-finalize-memleak.patch
 Patch1:                %{name}-no_launchers_on_panel.patch
 URL:           http://www.gnome.org/
@@ -33,7 +33,7 @@ BuildRequires:        perl-base
 BuildRequires: pkgconfig >= 1:0.15.0
 BuildRequires: python-libxml2
 BuildRequires: rpm-build >= 4.1-10
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper >= 0.3.11
 BuildConflicts:        GConf-devel < 1.0.9-7
 Requires(post,preun):  GConf2 >= 2.14.0
@@ -108,7 +108,7 @@ Biblioteka panelu GNOME.
 %patch1 -p1
 
 %build
-gnome-doc-prepare --copy --force
+%{__gnome_doc_prepare}
 %{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
@@ -155,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install panel-toplevel.schemas
 %gconf_schema_install window-list.schemas
 %gconf_schema_install workspace-switcher.schemas
+%update_icon_cache hicolor
 %{_bindir}/gconftool-2 --direct \
        --config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
        --load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
@@ -179,6 +180,7 @@ EOF
 
 %postun
 %scrollkeeper_update_postun
+%update_icon_cache hicolor
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig