X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=gdm.spec;h=5420a66c61d7976a11385d02e4878dd091d331af;hb=ec8ebb38f7220a2791fa27b1d5838805ea4b7a07;hp=a0407e723ddee020685461f356c8324193bc0e0a;hpb=1deeed32c6c1827963f6e955b9a50bf7353900e3;p=packages%2Fgdm.git

diff --git a/gdm.spec b/gdm.spec
index a0407e7..5420a66 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,13 +14,13 @@ Summary(pt_BR.UTF-8):	Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	3.2.0
-Release:	1
+Version:	3.2.1.1
+Release:	10
 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:	34819420a3177fe18eac2154762ed996
+# Source0-md5:	df3f38061066f5e0816676b4eef7854a
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -28,10 +28,13 @@ Source4:	%{name}-autologin.pamd
 Source5:	%{name}-custom.desktop
 Source6:	%{name}-default.desktop
 Source7:	%{name}.upstart
+Source8:	%{name}.service
+Source9:	%{name}.tmpfiles
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-polkit.patch
 Patch2:		%{name}-xsession.patch
 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
@@ -54,12 +57,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
@@ -79,18 +84,23 @@ Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires(posttrans):	dconf
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	/usr/bin/X
 Requires:	ConsoleKit-x11 >= 0.4.1
 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:	hicolor-icon-theme
 Requires:	pam >= 0.99.7.1
 Requires:	polkit-gnome >= 0.93
+Requires:	systemd-units >= 37-0.10
 Requires:	which
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
+Suggests:	pam-pam_gnome_keyring
 Suggests:	zenity
 Provides:	XDM
 Provides:	group(xdm)
@@ -137,11 +147,22 @@ GDM (GNOME Display Manager) - це реімплементація xdm (X Display
 Manager). GDM дозволяє вам входити в систему, на якій запущено X
 Window та підтримує роботу кількох різних X сеансів одночасно.
 
+%package libs
+Summary:	GDM libraries
+Summary(pl.UTF-8):	Biblioteki GDM
+Group:		Libraries
+
+%description libs
+GDM libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki GDM.
+
 %package devel
 Summary:	Header files for GDM
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja
 Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains the files necessary to develop applications
@@ -155,7 +176,7 @@ bibliotek programu GDM.
 Summary:	Static libraries for GDM
 Summary(pl.UTF-8):	Biblioteki statyczne dla GDM
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 This package contains static libraries for GDM.
@@ -178,12 +199,26 @@ Init script for GDM.
 %description init -l pl.UTF-8
 Skrypt init dla GDM-a.
 
+%package upstart
+Summary:	Upstart job description for GDM
+Summary(pl.UTF-8):	Opis zadania Upstart dla GDM
+Group:		Daemons
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart job description for GDM.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla GDM.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 touch data/gdm.schemas.in.in
@@ -214,17 +249,22 @@ 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 \
 	PAM_PREFIX=/etc
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm-password
 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}
+cp -p %{SOURCE8} $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
@@ -239,24 +279,30 @@ 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
 
 %post
-/sbin/ldconfig
 %glib_compile_schemas
 %gconf_schema_install gdm-simple-greeter.schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
+NORESTART=1
+%systemd_post gdm.service
 
 %preun
 %gconf_schema_uninstall gdm-simple-greeter.schemas
+%systemd_preun gdm.service
 
 %postun
-/sbin/ldconfig
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
+%systemd_reload
 
 if [ "$1" = "0" ]; then
 	%glib_compile_schemas
@@ -264,10 +310,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
@@ -280,6 +327,9 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del gdm
 fi
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -287,17 +337,12 @@ fi
 %attr(755,root,root) %{_sbindir}/gdm-binary
 %attr(755,root,root) %{_bindir}/gdm-screenshot
 %attr(755,root,root) %{_bindir}/gdmflexiserver
-%attr(755,root,root) %{_libdir}/libgdmgreeter.so.1.0.0
-%attr(755,root,root) %ghost %{_libdir}/libgdmgreeter.so.1
-%attr(755,root,root) %{_libdir}/libgdmsimplegreeter.so.1.0.0
-%attr(755,root,root) %ghost %{_libdir}/libgdmsimplegreeter.so.1
 %dir %{_libdir}/gdm
 %dir %{_libdir}/gdm/simple-greeter
 %dir %{_libdir}/gdm/simple-greeter/extensions
 %attr(755,root,root) %{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
 %attr(755,root,root) %{_libdir}/gdm/simple-greeter/extensions/libpassword.so
 %attr(755,root,root) %{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so
-%{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib
 %attr(755,root,root) %{_libexecdir}/gdm-crash-logger
 %attr(755,root,root) %{_libexecdir}/gdm-factory-slave
 %attr(755,root,root) %{_libexecdir}/gdm-host-chooser
@@ -321,7 +366,7 @@ fi
 %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
-%{_sysconfdir}/dconf/db/gdm
+%{_sysconfdir}/dconf/db/gdm.d
 %{_sysconfdir}/dconf/profile/gdm
 %attr(1755,root,xdm) %dir /var/cache/gdm
 %attr(1770,root,xdm) %dir /var/gdm
@@ -336,6 +381,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
@@ -345,11 +391,23 @@ 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)
+%attr(755,root,root) %{_libdir}/libgdmgreeter.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libgdmgreeter.so.1
+%attr(755,root,root) %{_libdir}/libgdmsimplegreeter.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/libgdmsimplegreeter.so.1
+%{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
+%dir %{_includedir}/gdm
+%dir %{_includedir}/gdm/greeter
 %{_includedir}/gdm/greeter/gdm-greeter-client.h
 %{_includedir}/gdm/greeter/gdm-greeter-sessions.h
+%dir %{_includedir}/gdm/simple-greeter
 %{_includedir}/gdm/simple-greeter/gdm-login-extension.h
 %{_pkgconfigdir}/gdmgreeter.pc
 %{_pkgconfigdir}/gdmsimplegreeter.pc
@@ -365,4 +423,7 @@ fi
 %files init
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/gdm
+
+%files upstart
+%defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf