X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdm.spec;h=12ded4eb815b0105528d94a176b2b71fb7f84573;hb=f3737f40980314adbe923528a147cc2aa1bfcf17;hp=5a732a3ff8e862c6740eadd9b165b2155d420c7c;hpb=0e7e27572c14a6ef72dfa3f41ba1faf6e9b47115;p=packages%2Fgdm.git

diff --git a/gdm.spec b/gdm.spec
index 5a732a3..12ded4e 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -15,7 +15,7 @@ Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
 Version:	3.2.1.1
-Release:	3
+Release:	12
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -28,6 +28,7 @@ Source4:	%{name}-autologin.pamd
 Source5:	%{name}-custom.desktop
 Source6:	%{name}-default.desktop
 Source7:	%{name}.upstart
+Source9:	%{name}.tmpfiles
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-polkit.patch
 Patch2:		%{name}-xsession.patch
@@ -55,12 +56,14 @@ BuildRequires:	libcanberra-gtk3-devel >= 0.4
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
 BuildRequires:	libxklavier-devel >= 4.0-2
+BuildRequires:	nss-devel >= 3.11.1
 BuildRequires:	pam-devel
 BuildRequires:	pango-devel >= 1.3.0
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
+BuildRequires:	polkit-devel >= 0.93
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.450
+BuildRequires:	rpmbuild(macros) >= 1.627
 BuildRequires:	scrollkeeper >= 0.1.4
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	upower-devel >= 0.9.0
@@ -80,7 +83,7 @@ Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(post):	dconf
+Requires(posttrans):	dconf
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	/usr/bin/X
 Requires:	ConsoleKit-x11 >= 0.4.1
@@ -92,7 +95,9 @@ Requires:	gnome-settings-daemon >= 2.91.91
 Requires:	hicolor-icon-theme
 Requires:	pam >= 0.99.7.1
 Requires:	polkit-gnome >= 0.93
+Requires:	systemd-units >= 37-0.10
 Requires:	which
+Requires:	xinitrc-ng >= 1.0
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
 Suggests:	pam-pam_gnome_keyring
@@ -101,6 +106,7 @@ Provides:	XDM
 Provides:	group(xdm)
 Provides:	user(xdm)
 Obsoletes:	gdm-Xnest
+Obsoletes:	gdm-systemd
 Obsoletes:	gdm-user-switch-applet
 Obsoletes:	gnome-applet-fast-user-switch
 Conflicts:	gdkxft
@@ -244,7 +250,8 @@ touch data/gdm.schemas.in.in
 rm -rf $RPM_BUILD_ROOT
 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
+	$RPM_BUILD_ROOT{%{_datadir}/xsessions,%{systemdunitdir}} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -256,6 +263,9 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 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
+
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 %find_lang %{name} --with-gnome --with-omf --all-name
@@ -270,6 +280,10 @@ cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%posttrans
+umask 022
+/usr/bin/dconf update
+
 %pre
 %groupadd -g 55 -r -f xdm
 %useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
@@ -279,14 +293,17 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install gdm-simple-greeter.schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
-%{_bindir}/dconf update
+NORESTART=1
+%systemd_post gdm.service
 
 %preun
 %gconf_schema_uninstall gdm-simple-greeter.schemas
+%systemd_preun gdm.service
 
 %postun
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
+%systemd_reload
 
 if [ "$1" = "0" ]; then
 	%glib_compile_schemas
@@ -294,10 +311,11 @@ if [ "$1" = "0" ]; then
 	%groupremove xdm
 fi
 
-%triggerpostun -- %{name} < 1:2.13.0.8-1
+%triggerpostun -- %{name} < 2:3.2.1.1-10
 if [ -f /etc/X11/gdm/gdm.conf-custom.rpmsave ]; then
 	mv /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
 fi
+%systemd_trigger gdm.service
 
 %post init
 /sbin/chkconfig --add gdm
@@ -364,6 +382,7 @@ fi
 %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
 %{_pixmapsdir}/*
 %{_datadir}/gdm
 %{_datadir}/polkit-1/actions/gdm.policy
@@ -373,6 +392,7 @@ fi
 %{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
+%{systemdunitdir}/gdm.service
 
 %files libs
 %defattr(644,root,root,755)