SHA256
1
0
forked from pool/gdm
OBS User autobuild
2009-12-08 09:25:27 +00:00
committed by Git OBS Bridge
parent 739810a443
commit 09722b303c
10 changed files with 848 additions and 210 deletions

View File

@@ -1,5 +1,5 @@
#
# spec file for package gdm (Version 2.29.1)
# spec file for package gdm (Version 2.28.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -42,8 +42,8 @@ BuildRequires: xorg-x11-server-extra
BuildRequires: zenity
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.29.1
Release: 1
Version: 2.28.0
Release: 2
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -51,7 +51,7 @@ Source2: gdm-autologin.pamd
# FIXME: See FIXME in the script.
Source3: SuSEconfig.gdm
Source5: sysconfig.displaymanager-gdm
# PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-gnome-settings-daemon-directory, --with-consolekit-directory, --with-at-spi-registryd-directory
# PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-gnome-settings-daemon-directory and --with-consolekit-directory
Patch1: gdm-helper-directory.patch
# PATCH-FIX-OPENSUSE gdm-2.21.9-no-fatal-warnings.patch -- Do not accept fatal warnings in development version: gdm is too critical
Patch2: gdm-2.21.9-no-fatal-warnings.patch
@@ -69,7 +69,7 @@ Patch13: gdm-sysconfig-settings.patch
Patch15: gdm-greeter-greater-ui.patch
# PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations.
Patch18: gdm-always-reflect-keyboard-layout.patch
# PATCH-FIX-UPSTREAM gdm-save-panel-space-on-low-resolutions.patch bnc449815 bgo603817 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. (needed because of gdm-domain-logon.patch)
# PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions.
Patch19: gdm-save-panel-space-on-low-resolutions.patch
# PATCH-FIX-UPSTREAM gdm-selecting-desktop-environment.patch bnc460591 mxwu@novell.com -- Selecting the right desktop environment
Patch20: gdm-selecting-desktop-environment.patch
@@ -77,12 +77,18 @@ Patch20: gdm-selecting-desktop-environment.patch
Patch31: gdm-gconf-path.patch
# PATCH-FIX-UPSTREAM gdm-keyboard-from-hal.patch bnc492284 bnc478083 vuntz@novell.com -- Read the keyboard layout from hal
Patch32: gdm-keyboard-from-hal.patch
# PATCH-FIX-OPENSUSE gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj@novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal)
Patch33: gdm-keyboard-from-sysconfig.patch
# PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default
Patch34: gdm-default-wm.patch
# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes
Patch35: gdm-xauthlocalhostname.patch
# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value
Patch36: gdm-build-fixes.patch
# PATCH-FIX-UPSTREAM gdm-autologin-once.patch bgo587606 vuntz@novell.com -- Make autologin work only once
Patch37: gdm-autologin-once.patch
# PATCH-FIX-UPSTREAM gdm-devkit-power.patch bgo596569 vuntz@opensuse.org -- Use devkit-power instead of non-existing dbus API, patch from upstream
Patch38: gdm-devkit-power.patch
# PATCH-FIX-UPSTREAM gdm-polkit-gnome-path.patch bgo597050 vuntz@opensuse.org -- Use the right patch for the polkit agent. The current patch is a quick workaround for now, until we know how upstream wants to fix this.
Patch39: gdm-polkit-gnome-path.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
@@ -150,10 +156,16 @@ gnome-patch-translation-prepare
%patch19 -p1
%patch20 -p1
%patch31 -p1
%if %suse_version > 1110
%patch32 -p1
%else
%patch33 -p1
%endif
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch40 -p1
%patch60
@@ -165,9 +177,9 @@ autoreconf -f -i
%configure\
--libexecdir=%{_prefix}/lib/gdm \
--localstatedir=%{_localstatedir} \
--with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \
--with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \
--with-consolekit-directory=%{_libexecdir}/ConsoleKit \
--with-at-spi-registryd-directory=%{_prefix}/lib/at-spi \
--with-gnome-settings-daemon-directory=%{_prefix}/lib/gnome-settings-daemon \
--with-consolekit-directory=%{_prefix}/lib/ConsoleKit \
--with-selinux \
--enable-ipv6\
--disable-scrollkeeper
@@ -175,9 +187,6 @@ autoreconf -f -i
%install
%makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%find_gconf_schemas
# Remove wrapper, it is not needed.
mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
@@ -247,7 +256,7 @@ fi
%{_libdir}/bonobo/servers/*
%{_datadir}/gnome-2.0/ui/*
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm
%attr(751,gdm,gdm) %dir %{_localstatedir}/run/gdm
%attr(755,gdm,gdm) %dir %{_localstatedir}/run/gdm
%attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml