packages (DEVEL): gnome-settings-daemon/gnome-settings-daemon.spec - update...

megabajt megabajt at pld-linux.org
Sun Nov 21 15:11:57 CET 2010


Author: megabajt                     Date: Sun Nov 21 14:11:57 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated to 2.91.3

---- Files affected:
packages/gnome-settings-daemon:
   gnome-settings-daemon.spec (1.32 -> 1.32.2.1) 

---- Diffs:

================================================================
Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec
diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.32 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.32.2.1
--- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.32	Tue Nov 16 20:56:05 2010
+++ packages/gnome-settings-daemon/gnome-settings-daemon.spec	Sun Nov 21 15:11:52 2010
@@ -2,38 +2,42 @@
 Summary:	GNOME Settings Daemon
 Summary(pl.UTF-8):	Demon ustawień GNOME
 Name:		gnome-settings-daemon
-Version:	2.32.1
+Version:	2.91.3
 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/2.91/%{name}-%{version}.tar.bz2
+# Source0-md5:	d09334b216e0ad2623026ad8fc52d35c
 Patch0:		%{name}-pa-reconnect.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-devel >= 1.2.0
 BuildRequires:	dbus-glib-devel >= 0.74
 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:	gnome-desktop3-devel >= 2.91.2
+BuildRequires:	gsettings-desktop-schemas-devel >= 0.1.1
+BuildRequires:	gtk+3-devel >= 2.91.0
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libcanberra-gtk-devel
-BuildRequires:	libgnomekbd-devel >= 2.32.0
+BuildRequires:	libcanberra-gtk3-devel
+BuildRequires:	libgnomekbd-devel >= 2.91.1
+BuildRequires:	libnotify-devel >= 0.6.1
 BuildRequires:	libtool
-BuildRequires:	libnotify-devel >= 0.4.5
 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:	xorg-lib-libXxf86misc-devel
-Requires(post,preun):	GConf2
 Requires(post,postun):	gtk+2
-Requires:	xorg-app-xrdb
+Requires(post,postun):	glib2 >= 1:2.26.0
+Requires:	gsettings-desktop-schemas >= 0.1.1
+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,6 +52,7 @@
 Summary:	Header file for developing GNOME Settings Daemon clients
 Summary(pl.UTF-8):	Plik nagłówkowy do tworzenia klientów demona ustawiń GNOME
 Group:		Development/Libraries
+Requires:	dbus-devel >= 1.2.0
 Requires:	dbus-glib-devel >= 0.74
 Requires:	glib2-devel >= 1:2.20.0
 # doesn't require base currently
@@ -62,9 +67,6 @@
 %setup -q
 %patch0 -p1
 
-sed -i -e 's/en at shaw//' po/LINGUAS
-rm -f po/en at shaw.po
-
 %build
 %{__glib_gettextize}
 %{__intltoolize}
@@ -73,7 +75,8 @@
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules
 %{__make}
 
 %install
@@ -82,7 +85,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $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}
 
@@ -90,41 +93,19 @@
 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
 %{_sysconfdir}/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
@@ -132,45 +113,42 @@
 %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
+%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/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/libsmartcard.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsound.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/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/smartcard.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
+%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
+%{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/gnome-settings-daemon
 %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/*/*.svg
+%{_mandir}/man1/gnome-settings-daemon.1*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/gnome-settings-daemon-2.0
+%{_includedir}/gnome-settings-daemon-3.0
 %{_pkgconfigdir}/gnome-settings-daemon.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -179,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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.32&r2=1.32.2.1&f=u



More information about the pld-cvs-commit mailing list