- 2.15.4, updated deps and file list, (re)generate icon cache, --as-needed

  support

Changed files:
    control-center.spec -> 1.193

diff --git a/control-center.spec b/control-center.spec
index 5c23df057763ebedc7af7d8ebe9727b5456710ae..7635b216c74b2b02230946b7a38f5be5114daaee 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,13 +5,13 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.15.3
-Release:       4
+Version:       2.15.4
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/control-center/2.15/%{name}-%{version}.tar.bz2
-# Source0-md5: 8e6f9e1247e7878642177f6c6acd78fe
+# Source0-md5: de3a495fc1265e9ed84212299ade5a0a
 Patch0:                %{name}-randr.patch
 Patch1:                %{name}-wm_properties-dir.patch
 Patch2:                %{name}-additional-metacity-keybinding.patch
@@ -29,32 +29,33 @@ BuildRequires:      automake >= 1.9.0
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: esound-devel
-BuildRequires: evolution-data-server-devel >= 1.7.2
+BuildRequires: evolution-data-server-devel >= 1.7.4
 BuildRequires: gettext-devel
-BuildRequires: gnome-desktop-devel >= 2.15.2
+BuildRequires: gnome-desktop-devel >= 2.15.4
 BuildRequires: gnome-doc-utils >= 0.7.1
-BuildRequires: gnome-menus-devel >= 2.14.0
-BuildRequires: gnome-vfs2-devel >= 2.15.1
+BuildRequires: gnome-menus-devel >= 2.15.4.1
+BuildRequires: gnome-vfs2-devel >= 2.15.3
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.7
-BuildRequires: gtk+2-devel >= 2:2.9.2
+BuildRequires: gtk+2-devel >= 2:2.10.0
 BuildRequires: intltool >= 0.35
-BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeui-devel >= 2.15.1
+BuildRequires: libglade2-devel >= 1:2.6.0
+BuildRequires: libgnomeui-devel >= 2.15.2
 BuildRequires: libxml2-devel >= 1:2.6.26
 BuildRequires: libxklavier-devel >= 2.91
 BuildRequires: libtool
-BuildRequires: metacity-devel >= 2:2.15.5
-BuildRequires: nautilus-devel >= 2.15.2
+BuildRequires: metacity-devel >= 2:2.15.8
+BuildRequires: nautilus-devel >= 2.15.4
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
 BuildRequires: xorg-lib-libxkbfile-devel
 BuildRequires: xorg-lib-libXxf86misc-devel
 Requires(post,preun):  GConf2 >= 2.14.0
 Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk+2 >= 2.10.0
 Requires(post,postun): scrollkeeper
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      desktop-file-utils
-Requires:      gnome-vfs2 >= 2.15.1
+Requires:      gnome-vfs2 >= 2.15.3
 Requires:      gstreamer-audio-effects-base >= 0.10.7
 Requires:      libxklavier >= 2.91
 Obsoletes:     acme
@@ -97,7 +98,7 @@ GNOME 
 Summary:       GNOME Control Center gnome-window-settings library
 Summary(pl):   Biblioteka Control Center gnome-window-settings
 Group:         Development/Libraries
-Requires:      libgnomeui >= 2.15.1
+Requires:      libgnomeui >= 2.15.2
 
 %description libs
 This package contains gnome-window-settings library.
@@ -150,6 +151,7 @@ gnome-doc-prepare --copy --force
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
        --disable-schemas-install \
        --enable-gstreamer=0.10 \
@@ -185,6 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install themus.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %preun
 %gconf_schema_uninstall apps_gnome_settings_daemon_default_editor.schemas
@@ -198,6 +201,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %scrollkeeper_update_postun
 %update_desktop_database_postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
@@ -219,8 +223,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/lib*.so
 %attr(755,root,root) %{_libdir}/window-manager-settings/*.so
 %dir %{_libdir}/window-manager-settings
-%{_libdir}/bonobo/servers/*
 %{_datadir}/control-center-2.0
+%{_datadir}/dbus-1/services/*.service
 %{_datadir}/desktop-directories/*.directory
 %{_datadir}/gnome/cursor-fonts
 %{_datadir}/gnome-default-applications
@@ -239,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/gnome-window-settings-2.0
+%{_includedir}/gnome-settings-daemon-2.0
 %{_pkgconfigdir}/*.pc
 
 %files static