SPECS: control-center.spec Merged from DEVEL

aflinta aflinta at pld-linux.org
Tue Sep 6 14:16:46 CEST 2005


Author: aflinta                      Date: Tue Sep  6 12:16:46 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
 Merged from DEVEL

---- Files affected:
SPECS:
   control-center.spec (1.171 -> 1.172) 

---- Diffs:

================================================================
Index: SPECS/control-center.spec
diff -u SPECS/control-center.spec:1.171 SPECS/control-center.spec:1.172
--- SPECS/control-center.spec:1.171	Thu Jul  7 13:33:28 2005
+++ SPECS/control-center.spec	Tue Sep  6 14:16:40 2005
@@ -6,21 +6,20 @@
 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
@@ -28,30 +27,34 @@
 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
@@ -128,9 +131,10 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 
-%patch7 -p1
 
 %build
+gnome-doc-prepare --copy --force
+%{__gnome_doc_common}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
@@ -141,6 +145,7 @@
 %configure \
 	--disable-schemas-install \
 	--enable-gstreamer \
+	--enable-aboutme \
 	X_EXTRA_LIBS="-lXext"
 %{__make}
 
@@ -171,6 +176,7 @@
 %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
@@ -184,12 +190,19 @@
 
 %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
@@ -204,6 +217,7 @@
 %{_datadir}/gnome/vfolders/*
 %{_datadir}/idl/*
 %{_iconsdir}/*/*/*/gnome-control-center.png
+%{_omf_dest_dir}/control-center
 %{_pixmapsdir}/*.png
 %{_desktopdir}/*.desktop
 
@@ -224,8 +238,53 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.171  2005/07/07 11:33:28  freetz
-- 2.10.2, dropped: broken dpi patch, def-app-capplet patch
+Revision 1.172  2005/09/06 12:16:40  aflinta
+ Merged from DEVEL
+
+Revision 1.170.2.13  2005/09/05 20:22:19  aflinta
+- BR:e-d-s
+
+Revision 1.170.2.12  2005/09/05 13:08:54  paladine
+- updated to 2.12.0
+- removed pangoxft_fix and xft-hack patches
+
+Revision 1.170.2.11  2005/08/22 21:23:23  paladine
+- updated to 2.11.92
+- updated pangoxft_fix patch
+
+Revision 1.170.2.10  2005/08/14 21:32:32  freetz
+- pangoxft fix added, rel.2
+
+Revision 1.170.2.9  2005/08/10 12:58:38  paladine
+- updated to 2.11.91
+
+Revision 1.170.2.8  2005/08/09 16:05:11  paladine
+- fixed copy/paste bug
+
+Revision 1.170.2.7  2005/08/09 13:34:12  paladine
+- package omf file
+- run scrollkeeper_update
+- itemize schemas
+
+Revision 1.170.2.6  2005/08/08 21:21:18  freetz
+- rel.2 for rebuild with e-d-s 1.3.7
+
+Revision 1.170.2.5  2005/07/27 21:03:19  paladine
+- updated to 2.11.90
+- gnome-doc-utils for omf docs
+
+Revision 1.170.2.4  2005/07/26 15:35:03  freetz
+- fix wm properties dir patch (metacity configuration works now), rel.2
+
+Revision 1.170.2.3  2005/07/18 19:17:54  wiget
+- 2.11.6
+- added xft-hack patch (don't require xft 2.1.7, patched xft from Xorg is ok)
+
+Revision 1.170.2.2  2005/07/08 06:47:33  wiget
+- updated to 2.11.5
+
+Revision 1.170.2.1  2005/07/04 20:37:53  freetz
+- 2.11.4, dropped dpi and reduced resources paches (not supported), cleanup
 
 Revision 1.170  2005/06/02 18:14:45  glen
 - findutils already required by rpm-build
@@ -277,645 +336,3 @@
 
 Revision 1.159.2.4  2005/03/11 15:29:18  aflinta
 - up to version 2.10.0
-
-Revision 1.159.2.3  2005/02/27 22:25:52  grzegol
-- rel. 0.2
-
-Revision 1.159.2.2  2005/02/10 17:57:19  grzegol
-- updated to 2.9.91
-
-Revision 1.159.2.1  2005/02/07 14:23:16  grzegol
-- removed outdated fontconfig, capplets-dir and evolution patches
-
-Revision 1.159  2005/02/04 10:24:06  aflinta
-- up to version 2.9.4, needs patch review, cleanups and maybe splitting nautilus plugins into separate packages
-
-Revision 1.158  2004/11/17 12:30:57  paladine
-- added desktop patch
-- rel 3
-
-Revision 1.157  2004/11/01 09:14:04  ankry
-- better place for an icon, rel. 2
-
-Revision 1.156  2004/10/15 10:02:28  aflinta
-- up to version 2.8.1
-
-Revision 1.155  2004/09/17 16:34:38  havner
-- rel 3
-
-Revision 1.154  2004/09/17 14:51:02  aflinta
-- use fixed translations from reduced_resources patch, release 2.6
-
-Revision 1.153  2004/09/17 13:54:55  krzak
-- reduced-resources.patch updated for gnome 2.8, Aflinta please
-  update polish translation inside
-- rel. 2.5
-
-Revision 1.152  2004/09/16 20:54:33  havner
-- capplet patch
-- rel 2
-
-Revision 1.151  2004/09/16 17:04:41  aflinta
-- release 1
-
-Revision 1.150  2004/09/15 10:52:17  grzegol
-- merged from DEVEL and updated to 2.8.0
-- removed locale-names patch and remove no locale in %install
-- added evolution patch (there is no evolution-1.6 binary, but evolution-2.0)
-- rel. 0.1 (reduced_resources and def-apps-capplet patches need to be checked)
-
-Revision 1.149  2004/08/18 13:17:40  krzak
-- metacity-devel >= 1:2.8.0
-
-Revision 1.148  2004/08/16 10:03:14  krzak
-- rel 3 - rebuild with nex XFree86
-
-Revision 1.147  2004/08/13 07:27:43  krzak
-- def-apps-capplet-browsers.patch
-  (fix browsers list with default applications capplet)
-- rel 2
-
-Revision 1.146.2.5  2004/08/30 12:10:18  grzegol
-- updated to 2.7.1
-
-Revision 1.146.2.4  2004/08/23 17:10:14  aflinta
-- release 0.3
-
-Revision 1.146.2.3  2004/08/23 16:59:35  grzegol
-- added epoch to metacity require
-
-Revision 1.146.2.2  2004/08/13 12:43:18  grzegol
-- added def-apps-capplet-browsers patch (from HEAD)
-- rel. 0.2
-
-Revision 1.146.2.1  2004/07/31 21:55:16  grzegol
-- updated to 2.7.0
-- commented out def-apps-capplet and reduced_resources patches (not updated)
-- rel. 0.1
-
-Revision 1.146  2004/04/16 11:08:27  grzegol
-- BR: libxklavier-devel >= 1.02
-
-Revision 1.145  2004/04/16 09:25:29  aflinta
-- up to version 2.6.1
-
-Revision 1.144  2004/04/05 22:12:37  grzegol
-- added --enable-gstreamer and BR: gstreamer-plugins-devel
-
-Revision 1.143  2004/04/02 13:02:54  grzegol
-- updated to 2.6.0.3
-
-Revision 1.142  2004/03/31 17:46:13  grzegol
-- updated to 2.6.0.2
-
-Revision 1.141  2004/03/31 17:04:10  qboosh
-- use iconsdir macro
-
-Revision 1.140  2004/03/31 16:27:32  grzegol
-- merged from DEVEL and updated to 2.6.0.1
-
-Revision 1.139  2003/12/04 22:47:51  krzak
-- reduced_resources.patch - allow on/off wireframe metacity mode
-- rel 12
-
-Revision 1.138  2003/11/19 23:15:13  krzak
-- report-no-theme.patch - When the user doesnt specify a location or specify a
-  non-existing theme location, just reporting what he specified is wrong.
-
-Revision 1.137  2003/11/19 22:50:22  krzak
-- add home-themes-fix.patch - stops the user from selecting the
-  $HOME/.themes directoryand pops out a error message saying that this
-  cannot be selected
-- rel 11
-
-Revision 1.136  2003/11/14 21:13:30  krzak
-- dpi.patch finally done
-- rel 10
-
-Revision 1.135.2.10  2004/03/18 18:14:36  grzegol
-- added epoch to audiofile requires
-
-Revision 1.135.2.9  2004/03/11 09:33:37  aflinta
-- up to version 2.5.4, but it has internally disabled gstreamer due bug #131316
-
-Revision 1.135.2.8  2004/03/09 23:59:45  freetz
-- fixed typo
-
-Revision 1.135.2.7  2004/03/09 12:25:11  grzegol
-- added Obsoletes: acme (has been merged with the Keyboard Shortcuts applet)
-- strict internal deps
-
-Revision 1.135.2.6  2004/02/13 22:07:06  grzegol
-- updated to 2.5.3
-- removed outdated DESTDIR and libxklavier patches
-- added locale-names patch (change locale no -> nb)
-
-Revision 1.135.2.5  2004/01/29 23:17:15  grzegol
-- added libxklavier patch (fix building with libxklavier-0.97)
-- rel. 2 to rebuild with libxklavier-0.97
-
-Revision 1.135.2.4  2004/01/14 13:19:54  trojan
-- updated to 2.5.2
-
-Revision 1.135.2.3  2004/01/01 21:39:36  grzegol
-- updated to 2.5.1.1
-
-Revision 1.135.2.2  2003/12/31 08:57:54  trojan
-- updated to 2.5.1
-- removed outdated patches
-- fixed files
-
-Revision 1.135.2.1  2003/11/16 17:22:31  wiget
-- 2.5.1
-
-Revision 1.135  2003/11/13 23:28:07  krzak
-- update dpi.patch (now you can disable autocalculating DPI)
-
-Revision 1.134  2003/11/12 23:44:48  krzak
-- X_EXTRA_LIBS="-lXext" (build with Xrandr now)
-- font-capplet-disable-dpi.patch (disable DPI sessing that is auto. set with
-  gnome-setting now)
-- rel 9
-
-Revision 1.133  2003/11/11 01:03:58  krzak
-- fixed themus.patch (sorry)
-- rel 8
-
-Revision 1.132  2003/11/10 01:00:41  krzak
-- removed gnome-terminal.patch (since gnome-network is fixed this patch
-  is not needed any more
-- rel 7
-
-Revision 1.131  2003/11/09 03:23:32  krzak
-- themus-glade.patch - install apply-font.glade in proper place
-- no more {_datadir}/control-center directory (uff)
-
-Revision 1.130  2003/11/09 02:09:36  krzak
-- pixmaps-dirs.patch ( clean stuff related to icons )
-- capplets-dir.patch ( install capplets in {_datadir}/gnome/capplets )
-- rel 6.
-
-Revision 1.129  2003/11/04 23:35:12  krzak
-- add additional-metacity-keybinding.patch that enable support for few
-  new metacity key bindings
-- rel 5
-
-Revision 1.128  2003/09/20 20:55:27  krzak
-- wm_properties-dir.patch search for window managers properties files in /usr/share/wm_properties either.
-- rel 4
-
-Revision 1.127  2003/09/16 18:58:13  krzak
-- gnome-terminal.patch for default exec_arg (http://bugzilla.gnome.org/show_bug.cgi?id=122475)
-- rel. 3
-
-Revision 1.126  2003/09/11 21:40:28  krzak
-- def-apps-capplet.patch
-- rel 2
-
-Revision 1.125  2003/09/08 19:44:20  grzegol
-- updated to 2.4.0
-
-Revision 1.124  2003/09/03 04:11:36  grzegol
-- updated to 2.3.6
-
-Revision 1.123  2003/08/14 21:43:31  aflinta
-- work around buggy XFree libs linking - thx for Jakub Bogusz for help; release 2
-
-Revision 1.122  2003/08/13 23:20:36  grzegol
-- fixed typo and cosmetics
-
-Revision 1.121  2003/08/13 23:15:49  ankry
-- cosmetics
-
-Revision 1.120  2003/08/12 04:34:49  aflinta
-- version 2.3.5
-
-Revision 1.119  2003/08/06 16:49:28  kloczek
-- może wrescie ktoś wykasuje to konto ?
-
-Revision 1.118  2003/08/01 12:02:49  grzegol
-- rel. 2 to rebuild without linc
-- added link patch
-- cosmetics
-
-Revision 1.117  2003/07/07 18:41:57  grzegol
-- added Requires(post): GConf2
-
-Revision 1.116  2003/07/07 13:03:14  qboosh
-- use _desktopdir macro, other minor changes where needed
-
-Revision 1.115  2003/07/07 07:28:36  trojan
-- updated to 2.3.4
-
-Revision 1.114  2003/06/25 17:40:09  grzegol
-- added window-manager-settings dir
-
-Revision 1.113  2003/06/24 23:07:10  wiget
-- updated to 2.3.3
-
-Revision 1.112  2003/06/24 18:20:13  jareq
-- fixed in static requires
-
-Revision 1.111  2003/06/21 23:35:19  jareq
-- fixed epoch:version issue
-
-Revision 1.110  2003/05/27 08:31:27  trojan
-- added Source-md5
-
-Revision 1.109  2003/05/25 05:46:21  misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.108  2003/05/21 10:27:05  aflinta
-- version 2.3.2
-
-Revision 1.107  2003/05/08 20:11:28  aflinta
-- release 1
-
-Revision 1.106  2003/05/08 15:48:04  wiget
-- updated to 2.3.1
-
-Revision 1.105  2003/04/25 09:16:20  trojan
-- added patch for new automake
-
-Revision 1.104  2003/04/15 08:14:15  wrobell
-- removed glade2 install requirement (please look at files section of
-  libglade2.spec instead)
-
-Revision 1.103  2003/04/14 22:42:47  mkochano
-- Release 1.2.
-- Requires: glade2.
-
-Revision 1.102  2003/04/14 22:33:06  mkochano
-- Release 1.1.
-- Own dirs: /usr/share/control-center-2.0,
-  /usr/share/control-center-2.0/capplets
-
-Revision 1.101  2003/03/14 06:22:29  aflinta
-- updated to version 2.2.1
-
-Revision 1.100  2003/02/05 08:15:19  trojan
-- updated to 2.2.0.1
-- removed outdated patch
-
-Revision 1.99  2003/01/26 23:02:54  aflinta
-- added gcc2 compat patch
-
-Revision 1.98  2003/01/21 08:28:28  aflinta
-- updated to version 2.2.0
-
-Revision 1.97  2003/01/16 10:01:30  aflinta
-- updated to version 2.1.7, is gnome-theme-manager working for someone?
-
-Revision 1.96  2003/01/14 07:25:43  trojan
-- fixed %files (no need 755 for *.la)
-
-Revision 1.95  2003/01/11 14:21:04  aflinta
-- updated to version 2.1.6
-
-Revision 1.94  2003/01/11 13:54:11  misiek
-- one more BR: startup-notification
-
-Revision 1.93  2002/12/19 02:15:08  aflinta
-- updated to version 2.1.5
-
-Revision 1.92  2002/12/09 07:09:56  aflinta
-- updated BR
-- release 5
-
-Revision 1.91  2002/12/05 00:14:49  aflinta
-- moved from /usr/X11R6 to /usr, release 4
-
-Revision 1.90  2002/11/28 23:48:30  wrobell
-- massive attack: do not put bonobo servers into /usr/lib; remove
-  _bonobo_server_dir definition (bonobo-activation configuration
-  should be modified to look for servers in /usr and /usr/X11R6)
-
-Revision 1.89  2002/11/28 13:53:27  wrobell
-- massive attack: s/_serverdir/_bonobo_server_dir/cg
-
-Revision 1.88  2002/11/27 23:28:47  grzegol
-- updated server file location
-- rel. 2
-
-Revision 1.87  2002/11/26 21:17:26  aflinta
-- updated to version 2.1.3
-
-Revision 1.86  2002/11/24 17:00:59  wrobell
-- use gconf_schema_install macro
-
-Revision 1.85  2002/11/23 00:25:25  aflinta
-- corrected pkgconfig location
-- release 3
-
-Revision 1.84  2002/11/12 15:37:30  krzak
-- mouse-am.patch
-
-Revision 1.83  2002/11/03 23:18:21  aflinta
-- updated to version 2.1.2
-
-Revision 1.82  2002/10/29 18:54:31  aflinta
-- rebuild against bonobo-activation 2.1.0, release up
-
-Revision 1.81  2002/10/24 18:07:38  malekith
-- release 2
-
-Revision 1.80  2002/10/21 19:33:03  aflinta
-- merged from DEVEL
-- updated to version 2.1.1
-
-Revision 1.71.2.19  2002/10/06 23:23:45  aflinta
-- added fontconfig.patch
-
-Revision 1.71.2.18  2002/10/02 08:32:54  aflinta
-- removed obsoleted patch entries
-
-Revision 1.71.2.17  2002/10/01 22:28:53  aflinta
-- updated to version 2.1.0.1
-
-Revision 1.71.2.16  2002/10/01 21:39:24  aflinta
-- typo
-
-Revision 1.71.2.15  2002/10/01 21:36:13  aflinta
-- updated to version 2.1.0 (thx Grzegorz Golawski for patch)
-
-Revision 1.71.2.14  2002/09/30 20:04:56  aflinta
-- started update to version 2.1.0, but it fails to compile :(
-
-Revision 1.71.2.13  2002/08/25 19:05:57  aflinta
-- updated to version 2.0.1.1
-
-Revision 1.71.2.12  2002/08/16 14:07:17  wolf
-- gconf fix
-
-Revision 1.71.2.11  2002/08/15 11:30:00  michuz
-- updated to 2.0.1
-
-Revision 1.71.2.10  2002/06/21 19:53:30  aflinta
-- updated files
-- release 1
-
-Revision 1.71.2.9  2002/06/21 12:55:05  wiget
-- start update to 2.0.0 and new %doc,
-- WARNING: some files are not included yet in %files
-
-Revision 1.71.2.8  2002/06/12 15:10:09  wiget
-- updated to 1.99.10
-
-Revision 1.71.2.7  2002/05/14 22:29:19  michuz
-- updated to 1.99.10
-
-Revision 1.71.2.6  2002/04/30 12:34:36  michuz
-- 1.99.9
-
-Revision 1.71.2.5  2002/04/30 01:32:01  michuz
-- added PR scrollkeeper again
-
-Revision 1.71.2.4  2002/04/30 01:26:53  michuz
-- added patch0 (for schemas)
-
-Revision 1.71.2.3  2002/04/30 01:06:22  michuz
-- updated to 1.99.8
-
-Revision 1.71.2.2  2002/04/26 20:52:02  michuz
-- updated %files
-
-Revision 1.71.2.1  2002/04/26 20:26:09  michuz
<<Diff was trimmed, longer than 597 lines>>

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




More information about the pld-cvs-commit mailing list