Accepting request 46245 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 46245 revision 3.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/46245
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=117

SuSEconfig.gtk2

@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (c) 2002 SuSE Gmbh Nuernberg, Germany.  All rights reserved.
-#
-# Author: Holger Hetterich <hhetter@suse.de>, 2002
-#
-#
-# check if we are started as root
-# only one of UID and USER must be set correctly
-
-if test "$UID" != 0 -a "$USER" != root; then
-    echo "You must be root to start $0."
-    exit 1
-fi
-
-test -n "$ROOT" && exit 0
-
-# Remove all old icon cache files to prevent keeping of empty
-# directories with icon-theme.cache after removing themes.
-if test -f $r/var/cache/gtk-2.0/icon-theme.cache-list ; then
-    for DIR in $(<$r/var/cache/gtk-2.0/icon-theme.cache-list) ; do
-	if test $(ls -1 "$DIR" | wc --lines) -le 1 -a -f $DIR/icon-theme.cache; then
-	    rm -f $DIR/icon-theme.cache
-	    rmdir --ignore-fail-on-non-empty "$DIR"
-	fi
-    done
-    rm /var/cache/gtk-2.0/icon-theme.cache-list
-fi
-# Update icon cache.
-(
-    # Ensure, that $XDG_DATA_DIRS is set properly. (#71978, #240603)
-    if test "$PROFILEREAD" != true ; then
-	. $r/etc/profile
-    fi
-    IFS="$IFS:"
-    for DIR in ${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/} ; do
-	for SUBDIR in $DIR/icons/* ; do
-	    if test ! -L "$SUBDIR" -a -d "$SUBDIR" ; then
-		/usr/bin/gtk-update-icon-cache --quiet --ignore-theme-index "$SUBDIR"
-		if test -f $SUBDIR/icon-theme.cache ; then
-		    echo $SUBDIR >>$r/var/cache/gtk-2.0/icon-theme.cache-list
-		fi
-	    fi
-	done
-    done
-)
-
-exit 0 

gtk2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Aug 25 21:50:25 CEST 2010 - vuntz@opensuse.org
+
+- Remove the remaining part of SuSEconfig.gtk2: the icon theme
+  cache updating mechanism is now handled directly by all
+  appropriate packages.
+- This means we don't need /var/cache/gtk-2.0/icon-theme.cache-list
+  anymore, nor the %preun hack that was removing icon theme caches.
+
 -------------------------------------------------------------------
 Wed Aug 25 12:09:21 CEST 2010 - vuntz@opensuse.org
 

gtk2.spec

@@ -28,7 +28,6 @@ Summary:        Library for Creation of Graphical User Interfaces (version 2)
 Url:            http://www.gtk.org/
 Group:          System/Libraries
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
-Source1:        SuSEconfig.gtk2
 Source2:        README.SuSE
 Source3:        gtkrc
 Source4:        baselibs.conf
@@ -159,7 +158,6 @@ configurable.
 translation-update-upstream
 translation-update-upstream po-properties gtk20-properties
 gnome-patch-translation-prepare
-cp -a %{S:1} .
 %if "%_lib" == "lib64"
 cp -a %{S:2} .
 # WARNING: This patch does not patch not installed demos and tests.
@@ -193,21 +191,15 @@ make
 %install
 %makeinstall
 find %{buildroot}%{_libdir} -name '*.la' -delete -print
-mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
-install -m 755 SuSEconfig.gtk2 $RPM_BUILD_ROOT/sbin/conf.d
 touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0
-touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/{,2.10.0/}{engines,filesystems,immodules,modules,printbackends}
 %find_lang gtk20
 %find_lang gtk20-properties gtk20.lang
 %if "%_lib" == "lib64"
-mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0\
+  mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
- $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
+  mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk64.immodules
-mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules\
- $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk64.immodules
 %endif
 # Install rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -225,17 +217,6 @@ rm -rf $RPM_BUILD_ROOT
   %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk.immodules
 %endif
 
-%preun
-# Remove all old icon cache files created by SuSEconfig.gtk2.
-# If it is an update, files will be re-created.
-if test -f var/cache/gtk-2.0/icon-theme.cache-list ; then
-    for DIR in $(<var/cache/gtk-2.0/icon-theme.cache-list) ; do
-	rm -f $DIR/icon-theme.cache
-	rmdir --ignore-fail-on-non-empty $DIR
-    done
-    rm var/cache/gtk-2.0/icon-theme.cache-list
-fi
-
 %postun -p /sbin/ldconfig
 
 %files
@@ -255,15 +236,12 @@ fi
 %dir %{_libdir}/gtk-2.0/2*/*
 %{_libdir}/gtk-2.0/2*/*/*.so
 %dir %{_sysconfdir}/gtk-2.0
-%dir %{_localstatedir}/cache/gtk-2.0
-%ghost %{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list
 %if "%_lib" == "lib64"
 %ghost %{_sysconfdir}/gtk-2.0/gtk64.immodules
 %else
 %ghost %{_sysconfdir}/gtk-2.0/gtk.immodules
 %endif
 %{_sysconfdir}/gtk-2.0/im-multipress.conf
-/sbin/conf.d/SuSEconfig.gtk2
 %{_libdir}/girepository-1.0/*.typelib
 
 %files branding-upstream