- updated to 2.24.0.1; merged from DEVEL

Changed files:
    gnome-control-center.spec -> 1.19

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index e514cdf65886735cc95f066ea9cbb80690c3a68c..feb05fc127ff0087edf05add28228a923b9a6de4 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -5,55 +5,52 @@ Summary(pt_BR.UTF-8): O Centro de Controle do GNOME
 Summary(ru.UTF-8):     Центр управления GNOME
 Summary(uk.UTF-8):     Центр керування GNOME
 Name:          gnome-control-center
-Version:       2.22.2.1
+Version:       2.24.0.1
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5: f708092437fff488656c01665cbe6ae9
-Patch0:                %{name}-randr.patch
-Patch1:                %{name}-wm_properties-dir.patch
-Patch3:                %{name}-default_apps.patch
-Patch4:                %{name}-capplet.patch
-Patch5:                %{name}-Makefile.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5: dcaf6e91fddbb1d57d045a4de34ec25c
+Patch0:                %{name}-default_apps.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.22.0
+BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: alsa-lib-devel >= 1.0.12
 BuildRequires: audiofile >= 1:0.2.6
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.9
 BuildRequires: bison
 BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: eel-devel >= 2.22.0
+BuildRequires: eel-devel >= 2.24.0
 BuildRequires: esound-devel
-BuildRequires: evolution-data-server-devel >= 2.22.0
+BuildRequires: evolution-data-server-devel >= 2.24.0
 BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.20.0
-BuildRequires: gnome-desktop-devel >= 2.22.0
+BuildRequires: gnome-desktop-devel >= 2.24.0
 BuildRequires: gnome-doc-utils >= 0.12.1
-BuildRequires: gnome-menus-devel >= 2.22.0
-BuildRequires: gnome-panel-devel >= 2.22.0
-BuildRequires: gnome-settings-daemon-devel >= 2.22.0
-BuildRequires: gnome-vfs2-devel >= 2.22.0
+BuildRequires: gnome-menus-devel >= 2.24.0
+BuildRequires: gnome-panel-devel >= 2.24.0
+BuildRequires: gnome-settings-daemon-devel >= 2.24.0
+BuildRequires: gnome-vfs2-devel >= 2.24.0
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.10
-BuildRequires: gtk+2-devel >= 2:2.12.8
+BuildRequires: gtk+2-devel >= 2:2.14.0
 BuildRequires: hal-devel >= 0.5.10
-BuildRequires: intltool >= 0.37.0
+BuildRequires: intltool >= 0.40.0
+BuildRequires: libcanberra-devel >= 0.4
+BuildRequires: libcanberra-gtk-devel >= 0.4
 BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomekbd-devel >= 2.22.0
-BuildRequires: libgnomeui-devel >= 2.22.1
-BuildRequires: librsvg-devel >= 2.20.0
+BuildRequires: libgnomekbd-devel >= 2.24.0
+BuildRequires: libgnomeui-devel >= 2.24.0
+BuildRequires: librsvg-devel >= 2.22.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.31
-BuildRequires: metacity-devel >= 2:2.22.0
-BuildRequires: nautilus-devel >= 2.22.0
+BuildRequires: metacity-devel >= 2:2.24.0
+BuildRequires: nautilus-devel >= 2.24.0
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
-BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libXScrnSaver-devel
 BuildRequires: xorg-lib-libXxf86misc-devel
 BuildRequires: xorg-lib-libxkbfile-devel
@@ -64,10 +61,10 @@ Requires(post,postun):      shared-mime-info
 Requires(post,preun):  GConf2
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      desktop-file-utils
-Requires:      gnome-settings-daemon >= 2.22.0
-Requires:      gnome-vfs2 >= 2.22.0
+Requires:      gnome-settings-daemon >= 2.24.0
+Requires:      gnome-vfs2 >= 2.24.0
 Requires:      gstreamer-audio-effects-base >= 0.10.10
-Suggests:      mousetweaks >= 2.22.0
+Suggests:      mousetweaks >= 2.24.0
 Provides:      control-center = %{epoch}:%{version}-%{release}
 Obsoletes:     acme
 Obsoletes:     control-center
@@ -112,7 +109,7 @@ GNOME вашей системы (такие вещи как фон рабоче
 Summary:       GNOME Control Center gnome-window-settings library
 Summary(pl.UTF-8):     Biblioteka Control Center gnome-window-settings
 Group:         X11/Libraries
-Requires:      gnome-desktop-libs >= 2.22.0
+Requires:      gnome-desktop-libs >= 2.24.0
 Provides:      control-center-libs = %{epoch}:%{version}-%{release}
 Obsoletes:     control-center-libs
 
@@ -128,10 +125,10 @@ Summary(pl.UTF-8):        Pliki nagłówkowe bibliotek GNOME Control Center
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      dbus-glib-devel >= 0.74
-Requires:      gnome-desktop-devel >= 2.22.0
-Requires:      gnome-menus-devel >= 2.22.0
-Requires:      gtk+2-devel >= 2:2.12.8
-Requires:      libgnomeui-devel >= 2.22.0
+Requires:      gnome-desktop-devel >= 2.24.0
+Requires:      gnome-menus-devel >= 2.24.0
+Requires:      gtk+2-devel >= 2:2.14.0
+Requires:      libgnomeui-devel >= 2.24.0
 Provides:      control-center-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     control-center-devel
 
@@ -158,13 +155,6 @@ Statyczne biblioteki GNOME Control Center.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
 
 %build
 %{__gnome_doc_prepare}
@@ -202,8 +192,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install control-center.schemas
-%gconf_schema_install fontilus.schemas
-%gconf_schema_install themus.schemas
 %scrollkeeper_update_post
 %update_mime_database
 %update_desktop_database_post
@@ -211,8 +199,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 %gconf_schema_uninstall        control-center.schemas
-%gconf_schema_uninstall fontilus.schemas
-%gconf_schema_uninstall themus.schemas
 
 %postun
 %scrollkeeper_update_postun
@@ -234,28 +220,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gnome-control-center
 %attr(755,root,root) %{_bindir}/gnome-default-applications-properties
 %attr(755,root,root) %{_bindir}/gnome-display-properties
-%attr(755,root,root) %{_bindir}/gnome-font-viewer
 %attr(755,root,root) %{_bindir}/gnome-keybinding-properties
 %attr(755,root,root) %{_bindir}/gnome-keyboard-properties
 %attr(755,root,root) %{_bindir}/gnome-mouse-properties
 %attr(755,root,root) %{_bindir}/gnome-network-preferences
 %attr(755,root,root) %{_bindir}/gnome-sound-properties
-%attr(755,root,root) %{_bindir}/gnome-theme-thumbnailer
-%attr(755,root,root) %{_bindir}/gnome-thumbnail-font
 %attr(755,root,root) %{_bindir}/gnome-typing-monitor
 %attr(755,root,root) %{_bindir}/gnome-window-properties
-%attr(755,root,root) %{_bindir}/themus-theme-applier
-%attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/libnautilus-fontilus.so
-%attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/libnautilus-themus.so
-%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libfont-method.so
-%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libtheme-method.so
 %dir %{_libdir}/window-manager-settings
 %attr(755,root,root) %{_libdir}/window-manager-settings/libmetacity.so
 %{_sysconfdir}/gconf/schemas/control-center.schemas
-%{_sysconfdir}/gconf/schemas/fontilus.schemas
-%{_sysconfdir}/gconf/schemas/themus.schemas
-%{_sysconfdir}/gnome-vfs-2.0/modules/font-method.conf
-%{_sysconfdir}/gnome-vfs-2.0/modules/theme-method.conf
 %{_sysconfdir}/xdg/autostart/gnome-at-session.desktop
 %{_sysconfdir}/xdg/menus/gnomecc.menu
 %{_datadir}/gnome-control-center
@@ -277,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgnome-window-settings.la
 %{_includedir}/gnome-window-settings-2.0
 %{_pkgconfigdir}/gnome-window-settings-2.0.pc
+%{_datadir}/pkgconfig/gnome-default-applications.pc
 %{_datadir}/pkgconfig/gnome-keybindings.pc
 
 %files static