SPECS (AC-branch): gnome-panel.spec - 2.14.3, use rpm macros

[freetz]

Author: freetz                       Date: Wed Aug  2 17:34:52 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 2.14.3, use rpm macros

---- Files affected:
SPECS:
   gnome-panel.spec (1.172.2.3 -> 1.172.2.4) 

---- Diffs:

================================================================
Index: SPECS/gnome-panel.spec
diff -u SPECS/gnome-panel.spec:1.172.2.3 SPECS/gnome-panel.spec:1.172.2.4
--- SPECS/gnome-panel.spec:1.172.2.3	Thu Jun  1 21:37:05 2006
+++ SPECS/gnome-panel.spec	Wed Aug  2 19:34:47 2006
@@ -2,12 +2,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/
@@ -34,7 +34,7 @@
 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
@@ -109,7 +109,7 @@
 %patch1 -p1
 
 %build
-gnome-doc-prepare --copy --force
+%{__gnome_doc_prepare}
 %{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
@@ -156,6 +156,7 @@
 %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
@@ -180,6 +181,7 @@
 
 %postun
 %scrollkeeper_update_postun
+%update_icon_cache hicolor
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -237,6 +239,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.4  2006/08/02 17:34:47  freetz
+- 2.14.3, use rpm macros
+
 Revision 1.172.2.3  2006/06/01 19:37:05  freetz
 - don't run glib-gettextize (breaks locale build)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.172.2.3&r2=1.172.2.4&f=u