packages: gdm/gdm.spec - updated to 3.4.0.1; merged from DEVEL=?UTF-8?Q?=20?=- BR for sys...

Thu Mar 29 22:39:09 CEST 2012

Author: kiesiu                       Date: Thu Mar 29 20:39:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.4.0.1; merged from DEVEL
- BR for systemd bcond

---- Files affected:
packages/gdm:
   gdm.spec (1.296 -> 1.297) 

---- Diffs:

================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.296 packages/gdm/gdm.spec:1.297

--- packages/gdm/gdm.spec:1.296	Sat Mar 24 03:17:36 2012
+++ packages/gdm/gdm.spec	Thu Mar 29 22:39:04 2012
@@ -4,8 +4,9 @@
 # - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
 # - check /etc/pam.d/gdm-autologin
 #
-# Conditiional build:
+# Conditional build:
 %bcond_without	selinux	# without selinux
+%bcond_with     systemd # rely on systemd for session tracking instead of ConsoleKit
 
 Summary:	GNOME Display Manager
 Summary(es.UTF-8):	Administrador de Entrada del GNOME
@@ -15,13 +16,13 @@
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	3.2.1.1
-Release:	14
+Version:	3.4.0.1
+Release:	1
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	df3f38061066f5e0816676b4eef7854a
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.4/%{name}-%{version}.tar.xz
+# Source0-md5:	7dedcccb5fee6f63224f5674920ef4af
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -36,7 +37,6 @@
 Patch3:		%{name}-defaults.patch
 Patch4:		shell-check.patch
 URL:		http://www.gnome.org/projects/gdm/
-BuildRequires:	GConf2-devel >= 2.32.0
 BuildRequires:	accountsservice-devel >= 0.6.12
 BuildRequires:	attr-devel
 BuildRequires:	audit-libs-devel
@@ -47,7 +47,7 @@
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	fontconfig-devel >= 2.5.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.28.0
+BuildRequires:	glib2-devel >= 1:2.30.0
 BuildRequires:	gnome-doc-utils
 BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
@@ -65,7 +65,7 @@
 BuildRequires:	polkit-devel >= 0.93
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.627
-BuildRequires:	scrollkeeper >= 0.1.4
+%{?with_systemd:BuildRequires:  systemd-devel}
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	upower-devel >= 0.9.0
 BuildRequires:	xorg-lib-libX11-devel
@@ -76,9 +76,8 @@
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xz
-Requires(post,postun):	/usr/bin/scrollkeeper-update
+Requires(post,postun):	glib2 >= 1:2.26.0
 Requires(post,postun):	gtk-update-icon-cache
-Requires(post,preun):	GConf2
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
@@ -91,8 +90,8 @@
 Requires:	accountsservice >= 0.6.12
 Requires:	dbus-x11
 Requires:	gdm-wm >= 3.2.1
-Requires:	gnome-session >= 2.91.91.1
-Requires:	gnome-settings-daemon >= 2.91.91
+Requires:	gnome-session >= 3.0.0
+Requires:	gnome-settings-daemon >= 3.0.0
 Requires:	hicolor-icon-theme
 Requires:	pam >= 0.99.7.1
 Requires:	polkit-gnome >= 0.93
@@ -235,6 +234,7 @@
 	--disable-console-helper \
 	--disable-scrollkeeper \
 	--disable-silent-rules \
+	%{__with_without systemd systemd} \
 	--with-console-kit \
 	--enable-authentication-scheme=pam \
 	--with-pam-prefix=/etc \
@@ -252,11 +252,11 @@
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security,init} \
 	$RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
 	$RPM_BUILD_ROOT{%{_datadir}/xsessions,%{systemdunitdir}} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	PAM_PREFIX=/etc
+	PAM_PREFIX=%{_sysconfdir}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm-password
@@ -265,7 +265,7 @@
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/init/%{name}.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
-install %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
@@ -291,16 +291,10 @@
 
 %post
 %glib_compile_schemas
-%gconf_schema_install gdm-simple-greeter.schemas
-%scrollkeeper_update_post
 %update_icon_cache hicolor
 %systemd_reload
 
-%preun
-%gconf_schema_uninstall gdm-simple-greeter.schemas
-
 %postun
-%scrollkeeper_update_postun
 %update_icon_cache hicolor
 %systemd_reload
 
@@ -361,7 +355,6 @@
 %dir %{_sysconfdir}/gdm/PostLogin
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
-%{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gdm*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.gdm
@@ -372,15 +365,12 @@
 %attr(1770,root,xdm) %dir /var/lib/gdm
 %dir /var/lib/gdm/.config
 %attr(755,xdm,xdm) %dir /var/lib/gdm/.config/dconf
-%attr(1750,root,xdm) %dir /var/lib/gdm/.gconf.mandatory
-%attr(1640,root,xdm) /var/lib/gdm/.gconf.mandatory/*.xml
-%attr(644,root,xdm) /var/lib/gdm/.gconf.path
 %attr(755,xdm,xdm) /var/lib/gdm/.local
 %attr(750,xdm,xdm) %dir /var/log/gdm
 %attr(711,root,xdm) %dir /var/run/gdm
 %attr(755,xdm,xdm) %dir /var/run/gdm/greeter
 %attr(750,xdm,xdm) /home/services/xdm
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
 %{_pixmapsdir}/*
 %{_datadir}/gdm
 %{_datadir}/polkit-1/actions/gdm.policy
@@ -433,8 +423,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.297  2012/03/29 20:39:04  kiesiu
+- updated to 3.4.0.1; merged from DEVEL
+- BR for systemd bcond
+
 Revision 1.296  2012/03/24 02:17:36  glen
 - keep the service mask in -init package
+
+Revision 1.295.2.2  2012/03/24 09:59:39  megabajt
+- added systemd bcond (off by default) - when enabled, systemd is used for
+  session tracking instead of deprecated ConsoleKit.
+
+Revision 1.295.2.1  2012/03/23 16:48:02  megabajt
+- updated to 3.3.92.1
 
 Revision 1.295  2012/03/18 12:49:56  baggins
 - rel 13
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gdm/gdm.spec?r1=1.296&r2=1.297

