SPECS (AC-branch): control-center.spec - merged from HEAD - update...

baggins baggins at pld-linux.org
Wed May 17 14:23:11 CEST 2006 

Author: baggins                      Date: Wed May 17 12:23:11 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD
- updated BRs for GNOME 2.14

---- Files affected:
SPECS:
   control-center.spec (1.179 -> 1.179.2.1) 

---- Diffs:

================================================================
Index: SPECS/control-center.spec
diff -u SPECS/control-center.spec:1.179 SPECS/control-center.spec:1.179.2.1
--- SPECS/control-center.spec:1.179	Wed Feb  8 17:23:32 2006
+++ SPECS/control-center.spec	Wed May 17 14:23:05 2006
@@ -1,28 +1,28 @@
 # $Revision$, $Date$
-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.12.3
+Version:	2.14.1
 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:	d673df12692ee08b9fc3d69739f8779e
 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
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.10.0
-BuildRequires:	ORBit2-devel >= 1:2.12.1
+BuildRequires:	GConf2-devel >= 2.14.0
+BuildRequires:	ORBit2-devel >= 1:2.14.0
 BuildRequires:	alsa-lib-devel >= 0.9.0
 BuildRequires:	audiofile >= 1:0.2.6
 BuildRequires:	autoconf
@@ -30,32 +30,32 @@
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	esound-devel
-BuildRequires:	evolution-data-server-devel >= 1.4.1
+BuildRequires:	evolution-data-server-devel >= 1.6.1
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-desktop-devel >= 2.12.1
+BuildRequires:	gnome-desktop-devel >= 2.14.0
 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-menus-devel >= 2.14.0
+BuildRequires:	gnome-vfs2-devel >= 2.14.0
+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
-BuildRequires:	libgnomeui-devel >= 2.11.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libxml2-devel >= 1:2.6.19
-BuildRequires:	libxklavier-devel >= 2.0
+BuildRequires:	libxklavier-devel >= 2.2
 BuildRequires:	libtool
-BuildRequires:	metacity-devel >= 2:2.12.1
-BuildRequires:	nautilus-devel >= 2.11.0
+BuildRequires:	metacity-devel >= 2:2.14.0
+BuildRequires:	nautilus-devel >= 2.14.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
+Requires:	gnome-vfs2 >= 2.14.0
+Requires:	libxklavier >= 2.2
 Obsoletes:	acme
 Obsoletes:	fontilus
 Obsoletes:	gnome
@@ -64,27 +64,20 @@
 
 %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 ×ÁŰĹĘ ÓÉÓÔĹÍŮ (ÔÁËÉĹ ×ĹÝÉ ËÁË ĆĎÎ ŇÁÂĎŢĹÇĎ ÓÔĎĚÁ É ÔĹÍŮ,
 ĐŇĎÇŇÁÍÍÁ ÓĎČŇÁÎĹÎÉŃ ÜËŇÁÎÁ, ĎËĎÎÎŮĘ ÍĹÎĹÄÖĹŇ, ÓÉÓÔĹÍÎŮĹ Ú×ŐËÉ,
 ĐĎ×ĹÄĹÎÉĹ ÍŮŰÉ É ÄŇ.)
@@ -92,36 +85,48 @@
 üÔĎÔ ĐÁËĹÔ ÎŐÖĹÎ, ĹÓĚÉ ×Ů ŐÓÔÁÎÁ×ĚÉ×ÁĹÔĹ ÓŇĹÄŐ 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.14.0
+
+%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
@@ -133,8 +138,6 @@
 %patch5 -p1
 %patch6 -p1 
 
-sed -i -e 's|-Wextra||' configure.in
-
 %build
 gnome-doc-prepare --copy --force
 %{__gnome_doc_common}
@@ -171,7 +174,6 @@
 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
@@ -192,10 +194,12 @@
 %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
@@ -209,21 +213,25 @@
 %{_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
 %dir %{_libdir}/window-manager-settings
 %{_libdir}/bonobo/servers/*
 %{_datadir}/control-center-2.0
+%{_datadir}/desktop-directories/*.directory
 %{_datadir}/gnome/cursor-fonts
-%{_datadir}/gnome/vfolders/*
+%{_datadir}/gnome-default-applications
 %{_datadir}/idl/*
 %{_iconsdir}/*/*/*/gnome-control-center.png
 %{_omf_dest_dir}/control-center
 %{_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
@@ -241,6 +249,46 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179.2.1  2006/05/17 12:23:05  baggins
+- merged from HEAD
+- updated BRs for GNOME 2.14
+
+Revision 1.184  2006/04/10 18:16:52  freetz
+- 2.14.1, evdev patch applied upstream, updated file list
+
+Revision 1.183  2006/04/09 22:31:58  wiget
+- added evdev.patch (fix interaction with new evdev input driver)
+- release 3
+
+Revision 1.182  2006/04/04 18:32:48  freetz
+- rel.2
+
+Revision 1.181  2006/04/02 13:36:07  freetz
+- added missing changlog info, corrected main Summary
+
+Revision 1.180  2006/04/02 13:28:53  freetz
+- merged from DEVEL, added libs subpackage
+- removed bullshit from en/pl description
+
+Revision 1.178.2.6  2006/03/13 15:22:47  freetz
+- 2.14.0
+
+Revision 1.178.2.5  2006/02/27 20:54:14  freetz
+- 2.13.93
+
+Revision 1.178.2.4  2006/02/14 08:37:28  freetz
+- 2.13.92
+
+Revision 1.178.2.3  2006/02/02 13:19:49  freetz
+- 2.13.91
+
+Revision 1.178.2.2  2006/01/31 19:37:57  patrys
+- disable es help locale to make it build
+
+Revision 1.178.2.1  2006/01/30 22:15:27  freetz
+- 2.13.90, updated BR, added default_apps patch, removed def-app-capplet
+  patch
+
 Revision 1.179  2006/02/08 16:23:32  freetz
 - 2.12.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/control-center.spec?r1=1.179&r2=1.179.2.1&f=u

More information about the pld-cvs-commit mailing list