-Summary: GNOME control center
+Summary: GNOME Control Center
Summary(es): El centro de controle del GNOME
-Summary(pl): Centrum kontroli GNOME
+Summary(pl): Centrum Kontroli GNOME
Summary(pt_BR): O Centro de Controle do GNOME
Summary(uk): ãÅÎÔÒ ËÅÒÕ×ÁÎÎÑ GNOME
Summary(ru): ãÅÎÔÒ ÕÐÒÁ×ÌÅÎÉÑ GNOME
Name: control-center
-Version: 2.6.0.1
+Version: 2.15.4
Release: 1
Epoch: 1
-License: GPL
+License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: e663e797f52514e5d5a4080ab6029542
-Patch0: %{name}-fontconfig.patch
-Patch1: %{name}-randr.patch
-Patch2: %{name}-def-apps-capplet.patch
-Patch3: %{name}-wm_properties-dir.patch
-Patch4: %{name}-additional-metacity-keybinding.patch
-Patch5: %{name}-capplets-dir.patch
-Patch6: %{name}-dpi.patch
-Patch7: %{name}-locale-names.patch
-Patch8: %{name}-reduced_resources.patch
+Source0: http://ftp.gnome.org/pub/gnome/sources/control-center/2.15/%{name}-%{version}.tar.bz2
+# Source0-md5: de3a495fc1265e9ed84212299ade5a0a
+Patch0: %{name}-randr.patch
+Patch1: %{name}-wm_properties-dir.patch
+Patch2: %{name}-additional-metacity-keybinding.patch
+Patch3: %{name}-default_apps.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.6.0
-BuildRequires: ORBit2-devel >= 1:2.10.0
+BuildRequires: GConf2-devel >= 2.14.0
+BuildRequires: ORBit2-devel >= 1:2.14.0
+BuildRequires: alsa-lib-devel >= 1.0.11
BuildRequires: audiofile >= 1:0.2.6
BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: automake >= 1.9.0
BuildRequires: bison
BuildRequires: flex
BuildRequires: esound-devel
-BuildRequires: findutils
+BuildRequires: evolution-data-server-devel >= 1.7.4
BuildRequires: gettext-devel
-BuildRequires: gnome-desktop-devel >= 2.6.0
-BuildRequires: gnome-vfs2-devel >= 2.6.0
-BuildRequires: gtk+2-devel >= 2:2.4.0
-BuildRequires: intltool >= 0.30
-BuildRequires: libbonobo-devel >= 2.6.0
-BuildRequires: libbonoboui-devel >= 2.6.0
-BuildRequires: libglade2-devel >= 1:2.3.6
-BuildRequires: libgnome-devel >= 2.6.0
-BuildRequires: libgnomeui-devel >= 2.6.0
-BuildRequires: libxml2-devel >= 2.6.7
-BuildRequires: libxklavier-devel >= 1.00
+BuildRequires: gnome-desktop-devel >= 2.15.4
+BuildRequires: gnome-doc-utils >= 0.7.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.10.0
+BuildRequires: intltool >= 0.35
+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.8.0
-BuildRequires: nautilus-devel >= 2.6.0
-BuildRequires: scrollkeeper >= 0.3.12
-BuildRequires: startup-notification-devel >= 0.5
-BuildRequires: xft-devel >= 2.1.1
-PreReq: /sbin/ldconfig
-PreReq: scrollkeeper
-Requires(post): GConf2
-Requires: gnome-vfs2 >= 2.6.0
+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.3
+Requires: gstreamer-audio-effects-base >= 0.10.7
+Requires: libxklavier >= 2.91
Obsoletes: acme
Obsoletes: fontilus
Obsoletes: gnome
%description
A Configuration tool for easily setting up your GNOME environment.
-GNOME is the GNU Network Object Model Environment. That's a fancy name
-but really GNOME is a nice GUI desktop environment. It makes using
-your computer easy, powerful, and easy to configure.
%description -l es
El control-center es una herramienta para una configuración facilitada
el entorno GNOME.
%description -l pl
-Narzêdzie do ³atwej konfiguracji twojego ¶rodowiska GNOME. GNOME to
-Obiektowe ¦rodowisko Sieciowe na licencji GNU (GNU Network Object
-Model Environment). Nazwa jest do¶æ dziwaczna, ale w rzeczywisto¶ci
-jest to mi³e ¶rodowisko pracy. Powoduje, ¿e u¿ywanie komputera jest
-proste, wydajne i ³atwe w konfiguracji.
+Narzêdzie do ³atwej konfiguracji ¶rodowiska GNOME.
%description -l pt_BR
-O control-center é uma ferramenta para facilmente configurar seu
+O Control Center é uma ferramenta para facilmente configurar seu
ambiente GNOME.
%description -l ru
-ðÁËÅÔ control-center ÓÏÄÅÒÖÉÔ ÕÔÉÌÉÔÙ, ÐÏÚ×ÏÌÑÀÝÉÅ ÎÁÓÔÒÁÉ×ÁÔØ ÓÒÅÄÕ
+ðÁËÅÔ Control Center ÓÏÄÅÒÖÉÔ ÕÔÉÌÉÔÙ, ÐÏÚ×ÏÌÑÀÝÉÅ ÎÁÓÔÒÁÉ×ÁÔØ ÓÒÅÄÕ
GNOME ×ÁÛÅÊ ÓÉÓÔÅÍÙ (ÔÁËÉÅ ×ÅÝÉ ËÁË ÆÏÎ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ É ÔÅÍÙ,
ÐÒÏÇÒÁÍÍÁ ÓÏÈÒÁÎÅÎÉÑ ÜËÒÁÎÁ, ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ, ÓÉÓÔÅÍÎÙÅ Ú×ÕËÉ,
ÐÏ×ÅÄÅÎÉÅ ÍÙÛÉ É ÄÒ.)
üÔÏÔ ÐÁËÅÔ ÎÕÖÅÎ, ÅÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ ÓÒÅÄÕ GNOME.
%description -l uk
-ðÁËÅÔ control-center ͦÓÔÉÔØ ÕÔÉ̦ÔÉ, Ñ˦ ÄÏÚ×ÏÌÑÀÔØ ÎÁÓÔÒÏÀ×ÁÔÉ
+ðÁËÅÔ Control Center ͦÓÔÉÔØ ÕÔÉ̦ÔÉ, Ñ˦ ÄÏÚ×ÏÌÑÀÔØ ÎÁÓÔÒÏÀ×ÁÔÉ
ÓÅÒÅÄÏ×ÉÝÅ GNOME ×ÁÛϧ ÓÉÓÔÅÍÉ (ÔÁ˦ ÒÅÞ¦ ÑË ÆÏÎ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ ÔÁ
ÔÅÍÉ, ÐÒÏÇÒÁÍÁ ÚÂÅÒÅÖÅÎÎÑ ÅËÒÁÎÕ, צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ, ÓÉÓÔÅÍΦ Ú×ÕËÉ,
ÐÏ×ÅĦÎËÁ ÍÉÛ¦ ÔÁ ¦Î.)
ãÅÊ ÐÁËÅÔ ÐÏÔÒ¦ÂÎÉÊ, ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ ÓÅÒÅÄÏ×ÉÝÅ GNOME.
+%package libs
+Summary: GNOME Control Center gnome-window-settings library
+Summary(pl): Biblioteka Control Center gnome-window-settings
+Group: Development/Libraries
+Requires: libgnomeui >= 2.15.2
+
+%description libs
+This package contains gnome-window-settings library.
+
+%description libs -l pl
+Pakiet ten zawiera bibliotekê gnome-window-settings.
+
%package devel
-Summary: GNOME Control-Center header files
-Summary(pl): Pliki nag³ówkowe bibliotek GNOME Control-Center
+Summary: GNOME Control Center header files
+Summary(pl): Pliki nag³ówkowe bibliotek GNOME Control Center
Group: X11/Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: fam-devel
%description devel
GNOME Control-Center header files.
%description devel -l pl
-Pliki nag³ówkowe bibliotek GNOME Control-Center
+Pliki nag³ówkowe bibliotek GNOME Control Center.
%package static
-Summary: GNOME Control-Center static libraries
-Summary(pl): Statyczne biblioteki GNOME Control-Center
+Summary: GNOME Control Center static libraries
+Summary(pl): Statyczne biblioteki GNOME Control Center
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%description static
-GNOME Control-Center static libraries.
+GNOME Control Center static libraries.
%description static -l pl
-Statyczne biblioteki GNOME Control-Center.
+Statyczne biblioteki GNOME Control Center.
%prep
%setup -q
-%patch0 -p1 -b .wiget
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
-mv po/{no,nb}.po
+%patch6 -p1
%build
-glib-gettextize --copy --force
-intltoolize --copy --force
+gnome-doc-prepare --copy --force
+%{__gnome_doc_common}
+%{__glib_gettextize}
+%{__intltoolize}
%{__libtoolize}
%{__aclocal}
%{__autoheader}
%{__autoconf}
%{__automake}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
%configure \
--disable-schemas-install \
+ --enable-gstreamer=0.10 \
+ --enable-aboutme \
X_EXTRA_LIBS="-lXext"
-
%{__make}
%install
# no static modules - shut up check-files
rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions*/*.{a,la}
rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.{a,la}
+#rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
%find_lang %{name} --with-gnome --all-name
%clean
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
-%gconf_schema_install
-
-%postun -p /sbin/ldconfig
+%gconf_schema_install apps_gnome_settings_daemon_default_editor.schemas
+%gconf_schema_install apps_gnome_settings_daemon_keybindings.schemas
+%gconf_schema_install apps_gnome_settings_daemon_screensaver.schemas
+%gconf_schema_install desktop_gnome_font_rendering.schemas
+%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
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%preun
+%gconf_schema_uninstall apps_gnome_settings_daemon_default_editor.schemas
+%gconf_schema_uninstall apps_gnome_settings_daemon_keybindings.schemas
+%gconf_schema_uninstall apps_gnome_settings_daemon_screensaver.schemas
+%gconf_schema_uninstall desktop_gnome_font_rendering.schemas
+%gconf_schema_uninstall desktop_gnome_peripherals_keyboard_xkb.schemas
+%gconf_schema_uninstall fontilus.schemas
+%gconf_schema_uninstall themus.schemas
+
+%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
%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}/fontilus-context-menu
%attr(755,root,root) %{_libdir}/gnome-settings-daemon
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_libdir}/bonobo/*.so
+%attr(755,root,root) %{_libdir}/nautilus/extensions*/*.so
%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}/application-registry/*
%{_datadir}/control-center-2.0
+%{_datadir}/dbus-1/services/*.service
+%{_datadir}/desktop-directories/*.directory
%{_datadir}/gnome/cursor-fonts
-%{_datadir}/gnome/vfolders/*
-%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome/capplets
-%{_datadir}/icons/*
+%{_datadir}/gnome-default-applications
%{_datadir}/idl/*
-%{_datadir}/mime-info/*
-%{_pixmapsdir}/gnomecc-2
+%{_iconsdir}/*/*/*/gnome-control-center.png
+%{_omf_dest_dir}/control-center
%{_pixmapsdir}/*.png
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
%files devel
%defattr(644,root,root,755)
%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