- merged from DEVEL, added libs subpackage

Changed files:
    control-center.spec -> 1.180

diff --git a/control-center.spec b/control-center.spec
index 755958c46b9e86a080b41fc3f849386437293424..32a78f5e721981a02acfb33619bb0593d0dfe2aa 100644 (file)
--- a/control-center.spec
+++ b/control-center.spec
@@ -1,21 +1,21 @@
 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.12.3
+Version:       2.14.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/control-center/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: e8f57ec1852d08d421016732b605a615
+Source0:       http://ftp.gnome.org/pub/gnome/sources/control-center/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 90195a0b42b94d80b0959c32162a10e3
 Patch0:                %{name}-randr.patch
 Patch1:                %{name}-wm_properties-dir.patch
 Patch2:                %{name}-additional-metacity-keybinding.patch
-Patch3:                %{name}-def-apps-capplet-browsers.patch
+Patch3:                %{name}-default_apps.patch
 Patch4:                %{name}-capplet.patch
 Patch5:                %{name}-desktop.patch
 Patch6:                %{name}-Makefile.patch
@@ -34,8 +34,8 @@ BuildRequires:        gettext-devel
 BuildRequires: gnome-desktop-devel >= 2.12.1
 BuildRequires: gnome-doc-utils >= 0.4.2
 BuildRequires: gnome-menus-devel >= 2.12.0
-BuildRequires: gnome-vfs2-devel >= 2.12.1
-BuildRequires: gstreamer-plugins-devel >= 0.8.8
+BuildRequires: gnome-vfs2-devel >= 2.13.4
+BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: gtk+2-devel >= 2:2.8.6
 BuildRequires: intltool >= 0.33
 BuildRequires: libglade2-devel >= 1:2.5.1
@@ -47,11 +47,10 @@ BuildRequires:      metacity-devel >= 2:2.12.1
 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(post,postun): scrollkeeper
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      desktop-file-utils
 Requires:      gnome-vfs2 >= 2.12.1
 Requires:      libxklavier >= 2.0-3
@@ -63,27 +62,20 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %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 ×ÁÛÅÊ ÓÉÓÔÅÍÙ (ÔÁËÉÅ ×ÅÝÉ ËÁË ÆÏÎ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ É ÔÅÍÙ,
 ÐÒÏÇÒÁÍÍÁ ÓÏÈÒÁÎÅÎÉÑ ÜËÒÁÎÁ, ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ, ÓÉÓÔÅÍÎÙÅ Ú×ÕËÉ,
 ÐÏ×ÅÄÅÎÉÅ ÍÙÛÉ É ÄÒ.)
@@ -91,36 +83,48 @@ 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.10.0-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}
 
 %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
@@ -170,7 +174,6 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/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
@@ -191,10 +194,12 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_uninstall themus.schemas
 
 %postun
-/sbin/ldconfig
 %scrollkeeper_update_postun
 %update_desktop_database_postun
 
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
@@ -208,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gnome-vfs-2.0/modules/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon
-%attr(755,root,root) %{_libdir}/lib*.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
@@ -216,6 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bonobo/servers/*
 %{_datadir}/control-center-2.0
 %{_datadir}/gnome/cursor-fonts
+%{_datadir}/gnome-default-applications
 %{_datadir}/gnome/vfolders/*
 %{_datadir}/idl/*
 %{_iconsdir}/*/*/*/gnome-control-center.png
@@ -223,6 +228,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/*.png
 %{_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