SPECS: gnome-control-center.spec - 2.22.0 - merged from DEVEL
patrys
patrys at pld-linux.org
Wed Mar 12 01:10:40 CET 2008
Author: patrys Date: Wed Mar 12 00:10:39 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL
---- Files affected:
SPECS:
gnome-control-center.spec (1.12 -> 1.13)
---- Diffs:
================================================================
Index: SPECS/gnome-control-center.spec
diff -u SPECS/gnome-control-center.spec:1.12 SPECS/gnome-control-center.spec:1.13
--- SPECS/gnome-control-center.spec:1.12 Fri Feb 8 21:19:18 2008
+++ SPECS/gnome-control-center.spec Wed Mar 12 01:10:34 2008
@@ -6,47 +6,50 @@
Summary(ru.UTF-8): Центр управления GNOME
Summary(uk.UTF-8): Центр керування GNOME
Name: gnome-control-center
-Version: 2.20.3
-Release: 2
+Version: 2.22.0
+Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: cd44c6b870d09ea5a049aa11385c97a6
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5: e6730ac4ee8b14a577978dee6c1cb88f
Patch0: %{name}-randr.patch
Patch1: %{name}-wm_properties-dir.patch
Patch3: %{name}-default_apps.patch
Patch4: %{name}-capplet.patch
Patch5: %{name}-Makefile.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.20.0
+BuildRequires: GConf2-devel >= 2.22.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.73
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: eel-devel >= 2.22.0
BuildRequires: esound-devel
-BuildRequires: evolution-data-server-devel >= 1.12.0
+BuildRequires: evolution-data-server-devel >= 2.22.0
BuildRequires: flex
BuildRequires: gettext-devel
BuildRequires: gnome-common >= 2.20.0
-BuildRequires: gnome-desktop-devel >= 2.20.0
-BuildRequires: gnome-doc-utils >= 0.12.0
-BuildRequires: gnome-menus-devel >= 2.20.0
-BuildRequires: gnome-panel-devel >= 2.20.0
-BuildRequires: gnome-vfs2-devel >= 2.20.0
+BuildRequires: gnome-desktop-devel >= 2.22.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: gstreamer-plugins-base-devel >= 0.10.10
-BuildRequires: gtk+2-devel >= 2:2.12.0
-BuildRequires: intltool >= 0.36.2
+BuildRequires: gtk+2-devel >= 2:2.12.8
+BuildRequires: hal-devel >= 0.5.10
+BuildRequires: intltool >= 0.37.0
BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomekbd-devel >= 2.20.0
-BuildRequires: libgnomeui-devel >= 2.20.0
-BuildRequires: librsvg-devel >= 2.18.1
+BuildRequires: libgnomekbd-devel >= 2.21.4.1
+BuildRequires: libgnomeui-devel >= 2.22.0
+BuildRequires: librsvg-devel >= 2.20.0
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 1:2.6.30
-BuildRequires: metacity-devel >= 2:2.20.0
-BuildRequires: nautilus-devel >= 2.20.0
+BuildRequires: libxml2-devel >= 1:2.6.31
+BuildRequires: metacity-devel >= 2:2.22.0
+BuildRequires: nautilus-devel >= 2.22.0
BuildRequires: pkgconfig
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.311
@@ -61,7 +64,8 @@
Requires(post,preun): GConf2
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: desktop-file-utils
-Requires: gnome-vfs2 >= 2.20.0
+Requires: gnome-settings-daemon >= 2.22.0
+Requires: gnome-vfs2 >= 2.22.0
Requires: gstreamer-audio-effects-base >= 0.10.10
Provides: control-center = %{epoch}:%{version}-%{release}
Obsoletes: acme
@@ -106,8 +110,8 @@
%package libs
Summary: GNOME Control Center gnome-window-settings library
Summary(pl.UTF-8): Biblioteka Control Center gnome-window-settings
-Group: Development/Libraries
-Requires: libgnomeui >= 2.20.0
+Group: X11/Libraries
+Requires: gnome-desktop-libs >= 2.22.0
Provides: control-center-libs = %{epoch}:%{version}-%{release}
Obsoletes: control-center-libs
@@ -122,13 +126,11 @@
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.73
-Requires: fam-devel
-Requires: gnome-desktop-devel >= 2.20.0
-Requires: gnome-menus-devel >= 2.20.0
-Requires: gtk+2-devel >= 2:2.12.0
-Requires: libgnomeui-devel >= 2.20.0
-Requires: librsvg-devel >= 2.18.1
+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
Provides: control-center-devel = %{epoch}:%{version}-%{release}
Obsoletes: control-center-devel
@@ -160,8 +162,8 @@
%patch4 -p1
%patch5 -p1
-sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
-mv po/sr\@{Latn,latin}.po
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
%build
%{__gnome_doc_prepare}
@@ -170,8 +172,8 @@
%{__intltoolize}
%{__libtoolize}
%{__aclocal}
-%{__autoheader}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
--disable-schemas-install \
@@ -198,11 +200,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-%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 control-center.schemas
-%gconf_schema_install desktop_gnome_font_rendering.schemas
%gconf_schema_install fontilus.schemas
%gconf_schema_install themus.schemas
%scrollkeeper_update_post
@@ -211,11 +209,7 @@
%update_icon_cache 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 control-center.schemas
-%gconf_schema_uninstall desktop_gnome_font_rendering.schemas
%gconf_schema_uninstall fontilus.schemas
%gconf_schema_uninstall themus.schemas
@@ -231,26 +225,41 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog MAINTAINERS NEWS README
-%{_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
+%attr(755,root,root) %{_bindir}/gnome-about-me
+%attr(755,root,root) %{_bindir}/gnome-appearance-properties
+%attr(755,root,root) %{_bindir}/gnome-at-mobility
+%attr(755,root,root) %{_bindir}/gnome-at-properties
+%attr(755,root,root) %{_bindir}/gnome-at-visual
+%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/desktop_gnome_font_rendering.schemas
%{_sysconfdir}/gconf/schemas/fontilus.schemas
%{_sysconfdir}/gconf/schemas/themus.schemas
-%{_sysconfdir}/gnome-vfs-2.0/modules/*
+%{_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
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon
-%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
%{_datadir}/gnome-control-center
-%{_datadir}/dbus-1/services/*.service
%{_datadir}/desktop-directories/*.directory
%{_datadir}/gnome/cursor-fonts
-%{_datadir}/gnome/autostart/gnome-at-session.desktop
%{_datadir}/mime/packages/gnome-theme-package.xml
%{_iconsdir}/hicolor/*/*/*.png
%{_iconsdir}/hicolor/*/*/*.svg
@@ -259,14 +268,13 @@
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgnome-window-settings.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnome-window-settings.so.1
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgnome-window-settings.so
%{_libdir}/libgnome-window-settings.la
-%{_includedir}/gnome-settings-daemon-2.0
%{_includedir}/gnome-window-settings-2.0
-%{_pkgconfigdir}/gnome-settings-daemon.pc
%{_pkgconfigdir}/gnome-window-settings-2.0.pc
%{_datadir}/pkgconfig/gnome-keybindings.pc
@@ -280,12 +288,41 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2008-03-12 00:10:34 patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.10.2.8 2008-03-12 00:08:51 patrys
+- 2.22.0
+
+Revision 1.10.2.7 2008-02-15 12:35:49 megabajt
+- updated deps
+- more verbose files
+
Revision 1.12 2008-02-08 20:19:18 hawk
- release 2
+Revision 1.10.2.6 2008-02-05 02:54:18 patrys
+- 2.21.90
+
+Revision 1.10.2.5 2008-01-15 16:47:01 patrys
+- drop files provided by settings daemon
+
+Revision 1.10.2.4 2008-01-15 16:19:10 patrys
+- BR: nautilus 2.21.5
+
+Revision 1.10.2.3 2008-01-15 16:17:55 patrys
+- 2.21.5
+
Revision 1.11 2008-01-09 19:11:02 megabajt
- updated to 2.20.3
+Revision 1.10.2.2 2007-12-26 21:41:09 megabajt
+- updated to 2.21.4
+
+Revision 1.10.2.1 2007-12-19 21:07:34 patrys
+- 2.21.2
+
Revision 1.10 2007-11-30 15:29:43 megabajt
- use --with-omf and better way to fix locale name
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-control-center.spec?r1=1.12&r2=1.13&f=u
More information about the pld-cvs-commit
mailing list