rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 84245 from home:vuntz:branches:GNOME:Factory

Browse Source 
Update to 3.1.92

OBS-URL: https://build.opensuse.org/request/show/84245
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=181
This commit is contained in:
Vincent Untz
2011-09-21 16:12:05 +00:00
committed by Git OBS Bridge
parent 7d6ebea3ac
commit 26951e6267
6 changed files with 484 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gdm.spec
View File

@@ -18,12 +18,11 @@
# FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999
%define enable_split_authentication 0
%define _dminitdir %{_prefix}/lib/X11/displaymanagers
Name: gdm
License: GPLv2+
Group: System/GUI/GNOME
Version: 3.1.91
Version: 3.1.92
Release: 1
Summary: The GNOME Display Manager
Url: http://projects.gnome.org/gdm/
@@ -68,8 +67,6 @@ Patch34: gdm-default-wm.patch
Patch35: gdm-xauthlocalhostname.patch
# PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting
Patch40: gdm-look-at-runlevel.patch
# PATCH-FIX-UPSTREAM gdm-fix-autologin.patch vuntz@opensuse.org -- Fix autologin, taken from git
Patch41: gdm-fix-autologin.patch
# PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux
Patch60: gdm-selinux.patch
BuildRequires: check-devel
@@ -237,7 +234,6 @@ translation-update-upstream
%patch34 -p1
%patch35 -p0
%patch40 -p1
%patch41 -p1
%patch60
#gnome-patch-translation-update
@@ -297,7 +293,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_
mv $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver $RPM_BUILD_ROOT%{_libexecdir}/gdm/gdmflexiserver
install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver
# Install /etc/xinit.d/xdm integration script
install -D -m 644 %{SOURCE5} %{buildroot}%{_dminitdir}/gdm
install -D -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm
# Install other files
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/gdm
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/gdm
@@ -305,7 +301,6 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm
%find_lang %{name} %{?no_lang_C}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -338,6 +333,7 @@ if test -f /sbin/conf.d/SuSEconfig.gdm; then
fi
%post
%glib2_gsettings_schema_post
%icon_theme_cache_post
%preun -f %{name}.schemas_preun
@@ -346,6 +342,7 @@ fi
%postun
%insserv_cleanup
%glib2_gsettings_schema_postun
%icon_theme_cache_postun
%post -n libgdmgreeter1 -p /sbin/ldconfig
@@ -356,15 +353,6 @@ fi
%postun -n libgdmsimplegreeter1 -p /sbin/ldconfig
%if %{enable_split_authentication}
%post simple-greeter-extensions
%glib2_gsettings_schema_post
%postun simple-greeter-extensions
%glib2_gsettings_schema_postun
%endif
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
@@ -381,6 +369,7 @@ fi
%{_bindir}/gdm
%{_bindir}/gdm-screenshot
%{_datadir}/gdm/
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
%{_datadir}/gnome-session/sessions/gdm-fallback.session
%{_datadir}/gnome-session/sessions/gdm-shell.session
%{_datadir}/icons/*/*/*/*.*
@@ -404,11 +393,13 @@ fi
%config /etc/pam.d/gdm-smartcart
%endif
%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
%dir %config %{_sysconfdir}/dconf/db/gdm.d
%dir %config %{_sysconfdir}/dconf/db/gdm.d/locks
%{_sysconfdir}/dconf/db/gdm
%{_sysconfdir}/dconf/profile/gdm
# /etc/xinit.d/xdm integration
%dir %{_dminitdir}
%{_dminitdir}/gdm
%dir %{_libexecdir}/X11/displaymanagers
%{_libexecdir}/X11/displaymanagers/gdm
# Exclude simple-greeter extensions
%exclude %{_datadir}/gdm/simple-greeter/extensions
@@ -441,11 +432,9 @@ fi
# fingerprint
%{_datadir}/gdm/simple-greeter/extensions/fingerprint/
%{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.fingerprint.gschema.xml
# smartcard
%{_datadir}/gdm/simple-greeter/extensions/smartcard/
%{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so
%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.smartcard.gschema.xml
%endif
%files devel