SPECS (AC-branch): gnome-icon-theme.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 14:54:37 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gnome-icon-theme.spec (1.38 -> 1.38.4.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-icon-theme.spec
diff -u SPECS/gnome-icon-theme.spec:1.38 SPECS/gnome-icon-theme.spec:1.38.4.1
--- SPECS/gnome-icon-theme.spec:1.38	Tue Oct  4 21:53:23 2005
+++ SPECS/gnome-icon-theme.spec	Mon May 15 16:54:32 2006
@@ -1,26 +1,28 @@
 # $Revision$, $Date$
-Summary:	Default icon themes for GNOME2 enviroment
-Summary(pl):	Domyślne motywy ikon dla środowiska GNOME2
+Summary:	Default icon themes for GNOME enviroment
+Summary(pl):	Domyślne motywy ikon dla środowiska GNOME
 Name:		gnome-icon-theme
-Version:	2.12.1
+Version:	2.14.2
 Release:	1
 License:	GPL
 Group:		Themes
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	a5401d6f085979fe6601f2241743af86
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	6f1d33a297bd27e0e9f4c1a5fa956166
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	glib2-devel >= 1:2.8.1
+BuildRequires:	gtk+2 >= 2:2.8.0
+# for future use (present only in 2.13.x)
+#BuildRequires:	icon-naming-utils >= 0.6.7
 BuildRequires:	intltool
-Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Default icon themes for GNOME2 enviroment.
+Default icon themes for GNOME enviroment.
 
 %description -l pl
-Domyślne motywy ikon dla środowiska GNOME2.
+Domyślne motywy ikon dla środowiska GNOME.
 
 %prep
 %setup -q
@@ -31,8 +33,7 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure \
-	--disable-hicolor-check
+%configure
 %{__make}
 
 %install
@@ -42,6 +43,8 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir='%{_pkgconfigdir}'
 
+gtk-update-icon-cache -ft $RPM_BUILD_ROOT%{_iconsdir}/gnome
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,8 +52,6 @@
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS
 %{_iconsdir}/gnome
-%{_iconsdir}/hicolor/*/*/*.*
-%{_iconsdir}/hicolor/*/stock/*/*.png
 %{_pkgconfigdir}/*.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -59,6 +60,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38.4.1  2006/05/15 14:54:32  baggins
+- merged from HEAD
+
+Revision 1.39  2006/04/01 21:22:20  freetz
+- merged from DEVEL
+
+Revision 1.38.2.7  2006/03/14 22:21:33  freetz
+- 2.14.2
+
+Revision 1.38.2.6  2006/02/25 22:46:00  freetz
+- 2.14.1
+
+Revision 1.38.2.5  2006/02/19 20:54:53  freetz
+- commented out icon-naming-utils BR
+
+Revision 1.38.2.4  2006/02/17 20:13:21  aflinta
+- up to 2.14.0
+
+Revision 1.38.2.3  2006/02/07 12:44:41  freetz
+- 2.13.7
+
+Revision 1.38.2.2  2006/02/05 08:50:24  freetz
+- 2.13.6
+
+Revision 1.38.2.1  2006/01/22 21:59:57  freetz
+- 2.13.5.1, updated BR, build icon cache, dropped hicolor-icon-theme deps
+
 Revision 1.38  2005/10/04 19:53:23  freetz
 - 2.12.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-icon-theme.spec?r1=1.38&r2=1.38.4.1&f=u