packages: gnome-settings-daemon/gnome-settings-daemon.spec - updated to 3.0...
kiesiu
kiesiu at pld-linux.org
Mon Apr 4 19:36:02 CEST 2011
Author: kiesiu Date: Mon Apr 4 17:36:02 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL
---- Files affected:
packages/gnome-settings-daemon:
gnome-settings-daemon.spec (1.34 -> 1.35)
---- Diffs:
================================================================
Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec
diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.34 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.35
--- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.34 Sat Apr 2 08:46:55 2011
+++ packages/gnome-settings-daemon/gnome-settings-daemon.spec Mon Apr 4 19:35:57 2011
@@ -2,38 +2,54 @@
Summary: GNOME Settings Daemon
Summary(pl.UTF-8): Demon ustawień GNOME
Name: gnome-settings-daemon
-Version: 2.32.1
-Release: 2
+Version: 3.0.0
+Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5: 6420706542e8fb959acba7e2a69ee35f
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: f369c858df94ea81d19ecedba377d1f1
Patch0: %{name}-pa-reconnect.patch
+# PLD-specific patches
+Patch100: use-etc-sysconfig-timezone.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: PackageKit-devel >= 0.6.4
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9
+BuildRequires: cups-devel
+BuildRequires: dbus-devel >= 1.2.0
BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: fontconfig-devel
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.20.0
-BuildRequires: gnome-desktop-devel >= 2.30.0
-BuildRequires: gtk+2-devel >= 2:2.22.0
+BuildRequires: glib2-devel >= 1:2.26.0
+BuildRequires: gnome-desktop-devel >= 2.91.93
+BuildRequires: gsettings-desktop-schemas-devel >= 2.91.92
+BuildRequires: gtk+3-devel >= 3.0.0
BuildRequires: intltool >= 0.40.0
-BuildRequires: libcanberra-gtk-devel
-BuildRequires: libgnomekbd-devel >= 2.32.0
-BuildRequires: libnotify-devel >= 0.4.5
+BuildRequires: libcanberra-gtk3-devel
+BuildRequires: libgnomekbd-devel >= 2.91.5
+BuildRequires: libnotify-devel >= 0.6.1
BuildRequires: libtool
BuildRequires: libxklavier-devel >= 5.0
+BuildRequires: nss-devel >= 3.11.2
BuildRequires: pkgconfig
-BuildRequires: polkit-devel >= 0.91
-BuildRequires: pulseaudio-devel >= 0.9.15
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: polkit-devel >= 0.97
+BuildRequires: pulseaudio-devel >= 0.9.16
+BuildRequires: rpmbuild(macros) >= 1.593
+BuildRequires: sed >= 4.0
+BuildRequires: udev-glib-devel
+BuildRequires: upower-devel >= 0.9.1
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-lib-libXxf86misc-devel
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
-Requires(post,preun): GConf2
-Requires: xorg-app-xrdb
+BuildRequires: xorg-proto-kbproto-devel
+Requires(post,postun): glib2 >= 1:2.26.0
+Requires: gnome-desktop >= 2.91.93
+Requires: gsettings-desktop-schemas >= 2.91.92
+Requires: gtk-update-icon-cache
+Requires: hicolor-icon-theme
# sr at Latn vs. sr at latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,8 +64,9 @@
Summary: Header file for developing GNOME Settings Daemon clients
Summary(pl.UTF-8): Plik nagłówkowy do tworzenia klientów demona ustawień GNOME
Group: Development/Libraries
+Requires: dbus-devel >= 1.2.0
Requires: dbus-glib-devel >= 0.74
-Requires: glib2-devel >= 1:2.20.0
+Requires: glib2-devel >= 1:2.26.0
# doesn't require base currently
%description devel
@@ -61,6 +78,7 @@
%prep
%setup -q
%patch0 -p1
+%patch100 -p1
%build
%{__glib_gettextize}
@@ -70,16 +88,18 @@
%{__autoheader}
%{__autoconf}
%{__automake}
-%configure
+%configure \
+ --disable-silent-rules
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-2.0/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.{a,la}
%find_lang %{name}
@@ -87,88 +107,76 @@
rm -rf $RPM_BUILD_ROOT
%post
-%gconf_schema_install apps_gnome_settings_daemon_housekeeping.schemas
-%gconf_schema_install apps_gnome_settings_daemon_keybindings.schemas
-%gconf_schema_install apps_gnome_settings_daemon_xrandr.schemas
-%gconf_schema_install desktop_gnome_font_rendering.schemas
-%gconf_schema_install desktop_gnome_keybindings.schemas
-%gconf_schema_install desktop_gnome_peripherals_smartcard.schemas
-%gconf_schema_install desktop_gnome_peripherals_touchpad.schemas
-%gconf_schema_install gnome-settings-daemon.schemas
%update_icon_cache hicolor
-
-%preun
-%gconf_schema_uninstall apps_gnome_settings_daemon_housekeeping.schemas
-%gconf_schema_uninstall apps_gnome_settings_daemon_keybindings.schemas
-%gconf_schema_uninstall apps_gnome_settings_daemon_xrandr.schemas
-%gconf_schema_uninstall desktop_gnome_font_rendering.schemas
-%gconf_schema_uninstall desktop_gnome_keybindings.schemas
-%gconf_schema_uninstall desktop_gnome_peripherals_smartcard.schemas
-%gconf_schema_uninstall desktop_gnome_peripherals_touchpad.schemas
-%gconf_schema_uninstall gnome-settings-daemon.schemas
+%glib_compile_schemas
%postun
%update_icon_cache hicolor
+if [ "$1" = "0" ]; then
+ %glib_compile_schemas
+fi
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog MAINTAINERS NEWS README
-/etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
-%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_housekeeping.schemas
-%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas
-%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas
-%{_sysconfdir}/gconf/schemas/desktop_gnome_keybindings.schemas
-%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_smartcard.schemas
-%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas
-%{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas
-%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
-%{_datadir}/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
-%{_datadir}/gnome-control-center/keybindings/50-accessibility.xml
-%{_datadir}/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
%attr(755,root,root) %{_libexecdir}/gnome-settings-daemon
%attr(755,root,root) %{_libexecdir}/gsd-locate-pointer
%attr(755,root,root) %{_libexecdir}/gsd-datetime-mechanism
-%dir %{_libdir}/gnome-settings-daemon-2.0
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/liba11y-keyboard.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libbackground.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libclipboard.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libfont.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libhousekeeping.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libkeybindings.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libkeyboard.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libmedia-keys.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libmouse.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libsmartcard.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libsound.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libtyping-break.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libxrandr.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libxrdb.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-2.0/libxsettings.so
-%{_libdir}/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/background.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/font.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/smartcard.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
-%{_datadir}/gnome-settings-daemon
+%attr(755,root,root) %{_libexecdir}/gsd-printer
+%dir %{_libdir}/gnome-settings-daemon-3.0
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libautomount.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libbackground.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libkeybindings.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libmedia-keys.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libmouse.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsound.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libupdates.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libwacom.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libxsettings.so
+%{_libdir}/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/automount.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/background.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/keybindings.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/updates.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
+%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules
+%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
+%{_datadir}/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
+%{_datadir}/glib-2.0/schemas/*.xml
+%{_datadir}/gnome-settings-daemon
+%{_datadir}/gnome-settings-daemon-3.0
+%{_datadir}/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
%{_iconsdir}/hicolor/*/*/*.png
%{_iconsdir}/hicolor/*/*/*.svg
+%{_mandir}/man1/gnome-settings-daemon.1*
+%{_sysconfdir}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
+%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
%files devel
%defattr(644,root,root,755)
-%{_includedir}/gnome-settings-daemon-2.0
+%{_includedir}/gnome-settings-daemon-3.0
%{_pkgconfigdir}/gnome-settings-daemon.pc
+%{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -176,12 +184,61 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.35 2011/04/04 17:35:57 kiesiu
+- updated to 3.0.0; merged from DEVEL
+
Revision 1.34 2011/04/02 06:46:55 qboosh
- en at shaw locale is now supported (via LANGUAGE)
- use __rm macro
Revision 1.33 2011/02/04 18:23:52 wiget
- Requires(post,postun): gtk-update-icon-cache
+
+Revision 1.32.2.15 2011/03/28 15:09:12 wiget
+- gnome-desktop3 renamed to gnome-desktop
+
+Revision 1.32.2.14 2011/03/26 21:13:16 megabajt
+- updated to 2.91.93
+
+Revision 1.32.2.13 2011/03/22 21:17:56 megabajt
+- require gnome-desktop3, not gnome-desktop
+
+Revision 1.32.2.12 2011/03/22 17:53:29 wiget
+- BR/R gsettings-desktop-schemas/gnome-desktop3 >= 2.91.92 (org.gnome.desktop.background picture-filename to picture-uri rename)
+
+Revision 1.32.2.11 2011/03/21 16:46:10 megabajt
+- updated to 2.91.92
+
+Revision 1.32.2.10 2011/03/20 15:56:13 megabajt
+- own %{_libdir}/gnome-settings-daemon-3.0/gtk-modules directory
+
+Revision 1.32.2.9 2011/03/17 21:24:38 wiget
+- BR update
+
+Revision 1.32.2.8 2011/03/16 22:05:24 megabajt
+- added use-etc-sysconfig-timezone.patch
+
+Revision 1.32.2.7 2011/03/08 19:28:21 megabajt
+- updated to 2.91.91
+
+Revision 1.32.2.6 2011/02/22 18:04:39 megabajt
+- updated to 2.91.90
+
+Revision 1.32.2.5 2011/02/03 17:44:58 wiget
+- up to 2.91.9
+
+Revision 1.32.2.4 2011/01/13 22:24:37 wiget
+- 2.91.8
+
+Revision 1.32.2.3 2010/12/28 18:12:34 wiget
+- 2.91.6.2
+
+Revision 1.32.2.2 2010/12/09 19:28:51 wiget
+- 2.91.5.1
+- added gtk3.patch to fix compilation with gtk+ 2.91.6
+
+Revision 1.32.2.1 2010/11/21 14:11:52 megabajt
+- updated to 2.91.3
Revision 1.32 2010/11/16 19:56:05 megabajt
- updated to 2.32.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon.spec?r1=1.34&r2=1.35&f=u
More information about the pld-cvs-commit
mailing list