Merged from DEVEL

Changed files:
    control-center.spec -> 1.172

diff --git a/control-center.spec b/control-center.spec
index 4962c9107c126705ad74946c4facc53730874ae6..7c266e00bc9d3e937a8058da693ce6b37872aec3 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -5,21 +5,20 @@ Summary(pt_BR):       O Centro de Controle do GNOME
 Summary(uk):   ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
 Summary(ru):   ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
 Name:          control-center
-Version:       2.10.2
+Version:       2.12.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/control-center/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5: 36022dcd340dac004903f5dadc8af589
+Source0:       http://ftp.gnome.org/pub/gnome/sources/control-center/2.12/%{name}-%{version}.tar.bz2
+# Source0-md5: 06a213f801bff26cee4f5db03a54da08
 Patch0:                %{name}-randr.patch
 Patch1:                %{name}-wm_properties-dir.patch
 Patch2:                %{name}-additional-metacity-keybinding.patch
-Patch3:                %{name}-reduced_resources.patch
-Patch4:                %{name}-def-apps-capplet-browsers.patch
-Patch5:                %{name}-capplet.patch
-Patch6:                %{name}-desktop.patch
-Patch7:                %{name}-Makefile.patch
+Patch3:                %{name}-def-apps-capplet-browsers.patch
+Patch4:                %{name}-capplet.patch
+Patch5:                %{name}-desktop.patch
+Patch6:                %{name}-Makefile.patch
 URL:           http://www.gnome.org/
 Icon:          control-center.gif
 BuildRequires: GConf2-devel >= 2.10.0
@@ -27,30 +26,34 @@ BuildRequires:      ORBit2-devel >= 1:2.12.1
 BuildRequires: alsa-lib-devel >= 0.9.0
 BuildRequires: audiofile >= 1:0.2.6
 BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: automake >= 1.9.0
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: esound-devel
+BuildRequires: evolution-data-server-devel >= 1.4.0
 BuildRequires: gettext-devel
-BuildRequires: gnome-desktop-devel >= 2.10.0-2
-BuildRequires: gnome-menus-devel >= 2.10.1
-BuildRequires: gnome-vfs2-devel >= 2.10.0-2
+BuildRequires: gnome-desktop-devel >= 2.11.0
+BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: gnome-menus-devel >= 2.11.0
+BuildRequires: gnome-vfs2-devel >= 2.11.0
 BuildRequires: gstreamer-plugins-devel >= 0.8.8
-BuildRequires: gtk+2-devel >= 2:2.6.4
+BuildRequires: gtk+2-devel >= 2:2.8.0
 BuildRequires: intltool >= 0.33
 BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: libgnomeui-devel >= 2.11.0
 BuildRequires: libxml2-devel >= 1:2.6.19
 BuildRequires: libxklavier-devel >= 2.0
 BuildRequires: libtool
 BuildRequires: metacity-devel >= 2:2.10.0
-BuildRequires: nautilus-devel >= 2.10.0-3
+BuildRequires: nautilus-devel >= 2.11.0
 BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: scrollkeeper
 BuildRequires: xft-devel >= 2.1.1
 Requires(post,postun): /sbin/ldconfig
 Requires(post,preun):  GConf2
 Requires(post,postun): desktop-file-utils
-Requires:      gnome-vfs2 >= 2.10.0-2
+Requires(post,postun): scrollkeeper
+Requires:      gnome-vfs2 >= 2.11.0
 Obsoletes:     acme
 Obsoletes:     fontilus
 Obsoletes:     gnome
@@ -127,9 +130,10 @@ Statyczne biblioteki GNOME Control-Center.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 
-%patch7 -p1
 
 %build
+gnome-doc-prepare --copy --force
+%{__gnome_doc_common}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -140,6 +144,7 @@ Statyczne biblioteki GNOME Control-Center.
 %configure \
        --disable-schemas-install \
        --enable-gstreamer \
+       --enable-aboutme \
        X_EXTRA_LIBS="-lXext"
 %{__make}
 
@@ -170,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install desktop_gnome_peripherals_keyboard_xkb.schemas
 %gconf_schema_install fontilus.schemas
 %gconf_schema_install themus.schemas
+%scrollkeeper_update_post
 %update_desktop_database_post
 
 %preun
@@ -183,12 +189,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun
 /sbin/ldconfig
+%scrollkeeper_update_postun
 %update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
+%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
+%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas
+%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
+%{_sysconfdir}/gconf/schemas/fontilus.schemas
+%{_sysconfdir}/gconf/schemas/themus.schemas
 %{_sysconfdir}/gnome-vfs-2.0/modules/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon
@@ -203,6 +216,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome/vfolders/*
 %{_datadir}/idl/*
 %{_iconsdir}/*/*/*/gnome-control-center.png
+%{_omf_dest_dir}/control-center
 %{_pixmapsdir}/*.png
 %{_desktopdir}/*.desktop