Accepting request 133693 from GNOME:Next
Pushing from G:N; package is fine with me now; just not sure the two patches I rebased work ;-) OBS-URL: https://build.opensuse.org/request/show/133693 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=217
This commit is contained in:
Vincent Untz
committed by
Git OBS Bridge
Git OBS Bridge
parent
59630e7535
commit
4083398e2e
117
gdm.spec
117
gdm.spec
@@ -24,36 +24,30 @@
|
||||
%define enable_split_authentication 0
|
||||
|
||||
Name: gdm
|
||||
Version: 3.4.1
|
||||
Version: 3.5.91
|
||||
Release: 0
|
||||
Summary: The GNOME Display Manager
|
||||
License: GPL-2.0+
|
||||
Group: System/GUI/GNOME
|
||||
Url: http://projects.gnome.org/gdm/
|
||||
Source: http://download.gnome.org/sources/gdm/3.4/%{name}-%{version}.tar.xz
|
||||
Source: http://download.gnome.org/sources/gdm/3.5/%{name}-%{version}.tar.xz
|
||||
Source1: gdm.pamd
|
||||
Source2: gdm-autologin.pamd
|
||||
Source3: gdm-welcome.pamd
|
||||
# gdmflexiserver wrapper, to enable other display managers to abuse the gdmflexiserver namespace (like lightdm)
|
||||
Source4: gdmflexiserver-wrapper
|
||||
Source3: gdm-launch-environment.pamd
|
||||
Source6: gdm-fingerprint.pamd
|
||||
Source7: gdm-smartcard.pamd
|
||||
# /etc/xinit.d/xdm integration script
|
||||
Source5: X11-displaymanager-gdm
|
||||
# PATCH-FEATURE-UPSTREAM gdm-plymouth.patch vuntz@opensuse.org -- Get a nice transition from plymouth; taken from Fedora
|
||||
Patch0: gdm-plymouth.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-consolekit-directory, --with-check-accelerated-directory
|
||||
Patch2: gdm-helper-directory.patch
|
||||
# PATCH-FIX-OPENSUSE gdm-is-not-unstable-unless.patch vuntz@opensuse.org -- Make gdm think it's never running a development version unless SUSE_ENABLE_UNSTABLE_CHECK is set. This disables fatal warnings as well as abusive log
|
||||
Patch3: gdm-is-not-unstable-unless.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj@novell.com -- Needed for user switching
|
||||
Patch4: gdm-vt-allocation-hack.patch
|
||||
# PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started
|
||||
# PATCH-NEEDS-REBASE PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started
|
||||
Patch6: gdm-desktop-session-env-pam.patch
|
||||
# PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts
|
||||
Patch7: gdm-suse-xsession.patch
|
||||
# WARNING: do not remove/significantly change patch8 without updating the relevant patch in accountsservice too
|
||||
# PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager; note that accountsservice has a similar patch (accountsservice-sysconfig.patch)
|
||||
Patch8: gdm-sysconfig-settings.patch
|
||||
# PATCH-FEATURE-OPENSUSE gdm-passwordless-login.patch vuntz@opensuse.org -- Support DISPLAYMANAGER_PASSWORD_LESS_LOGIN sysconfig option
|
||||
# PATCH-NEEDS-REBASE PATCH-FEATURE-OPENSUSE gdm-passwordless-login.patch vuntz@opensuse.org -- Support DISPLAYMANAGER_PASSWORD_LESS_LOGIN sysconfig option
|
||||
Patch9: gdm-passwordless-login.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch)
|
||||
Patch15: gdm-greeter-greater-ui.patch
|
||||
@@ -65,27 +59,20 @@ 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-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux
|
||||
Patch60: gdm-selinux.patch
|
||||
BuildRequires: check-devel
|
||||
BuildRequires: dbus-1-glib-devel
|
||||
# needed for directory ownership
|
||||
BuildRequires: dconf
|
||||
BuildRequires: gnome-doc-utils-devel
|
||||
BuildRequires: gnome-common
|
||||
# needed for directory ownership
|
||||
BuildRequires: gnome-session-core
|
||||
BuildRequires: gobject-introspection-devel >= 0.9.12
|
||||
BuildRequires: intltool
|
||||
BuildRequires: iso-codes-devel
|
||||
BuildRequires: libXdmcp-devel
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: libXinerama-devel
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libcanberra-devel
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libupower-glib-devel
|
||||
BuildRequires: libxklavier-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: tcpd-devel
|
||||
@@ -96,15 +83,17 @@ BuildRequires: xorg-x11-server-extra
|
||||
BuildRequires: pkgconfig(accountsservice)
|
||||
%if %{with_systemd}
|
||||
BuildRequires: pkgconfig(libsystemd-daemon)
|
||||
BuildRequires: pkgconfig(libsystemd-login)
|
||||
BuildRequires: pkgconfig(libsystemd-login) >= 186
|
||||
%endif
|
||||
BuildRequires: pkgconfig(nss)
|
||||
BuildRequires: pkgconfig(ply-boot-client)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xau)
|
||||
BuildRequires: pkgconfig(xrandr)
|
||||
Requires: %{name}-branding = %{version}
|
||||
%if ! %{with_systemd}
|
||||
Requires: ConsoleKit-x11
|
||||
Requires: gdmflexiserver
|
||||
%endif
|
||||
Requires: gnome-session-core
|
||||
Requires: klogd
|
||||
Requires: xorg-x11-server-extra
|
||||
@@ -131,6 +120,8 @@ Provides: gdm2 = %{version}
|
||||
Obsoletes: gdm2 < %{version}
|
||||
Provides: gnome-applets-gdm = %{version}
|
||||
Obsoletes: gnome-applets-gdm < %{version}
|
||||
# gdmflexiserver is dropped since 3.5.90
|
||||
Obsoletes: gdmflexiserver < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
DocDir: %{_defaultdocdir}
|
||||
%glib2_gsettings_schema_requires
|
||||
@@ -139,20 +130,20 @@ DocDir: %{_defaultdocdir}
|
||||
The GNOME Display Manager is a system service that is responsible for
|
||||
providing graphical log-ins and managing local and remote displays.
|
||||
|
||||
%package -n libgdmgreeter1
|
||||
%package -n libgdm1
|
||||
Summary: Client Library for Communicating with GDM Greeter Server
|
||||
Group: System/Libraries
|
||||
Recommends: gdm
|
||||
|
||||
%description -n libgdmgreeter1
|
||||
%description -n libgdm1
|
||||
The GNOME Display Manager is a system service that is responsible for
|
||||
providing graphical log-ins and managing local and remote displays.
|
||||
|
||||
%package -n typelib-1_0-GdmGreeter-1_0
|
||||
%package -n typelib-1_0-Gdm-1_0
|
||||
Summary: Client Library for Communicating with GDM Greeter Server -- Introspection bindings
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n typelib-1_0-GdmGreeter-1_0
|
||||
%description -n typelib-1_0-Gdm-1_0
|
||||
The GNOME Display Manager is a system service that is responsible for
|
||||
providing graphical log-ins and managing local and remote displays.
|
||||
|
||||
@@ -183,9 +174,9 @@ providing graphical log-ins and managing local and remote displays.
|
||||
%package devel
|
||||
Summary: Libraries for GDM -- Development Files
|
||||
Group: Development/Libraries/GNOME
|
||||
Requires: libgdmgreeter1 = %{version}
|
||||
Requires: libgdm1 = %{version}
|
||||
Requires: libgdmsimplegreeter1 = %{version}
|
||||
Requires: typelib-1_0-GdmGreeter-1_0 = %{version}
|
||||
Requires: typelib-1_0-Gdm-1_0 = %{version}
|
||||
Provides: libgdmsimplegreeter-devel = %{version}
|
||||
Obsoletes: libgdmsimplegreeter-devel < %{version}
|
||||
|
||||
@@ -211,26 +202,11 @@ providing graphical log-ins and managing local and remote displays.
|
||||
|
||||
This package provides the upstream default configuration for gdm.
|
||||
|
||||
%package -n gdmflexiserver
|
||||
Summary: Gdmflexiserver Compatibility Wrapper for Display Managers
|
||||
Group: System/GUI/GNOME
|
||||
Suggests: gdm
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n gdmflexiserver
|
||||
The gdmflexiserver tool interacts with the display manager to
|
||||
enable fast user switching. This package contains a wrapper that
|
||||
selects the correct gdmflexiserver implementatoin, based on the
|
||||
running display manager.
|
||||
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
@@ -238,13 +214,11 @@ translation-update-upstream
|
||||
%patch15 -p1
|
||||
%patch18 -p1
|
||||
%patch34 -p1
|
||||
%patch35 -p0
|
||||
%patch35 -p1
|
||||
%patch40 -p1
|
||||
%patch60
|
||||
|
||||
%build
|
||||
libtoolize -f -i
|
||||
autoreconf -f -i
|
||||
NOCONFIGURE=1 gnome-autogen.sh
|
||||
%configure\
|
||||
--disable-static \
|
||||
--libexecdir=%{_prefix}/lib/gdm \
|
||||
@@ -252,8 +226,8 @@ autoreconf -f -i
|
||||
--with-at-spi-registryd-directory=%{_libexecdir}/at-spi \
|
||||
--with-consolekit-directory=%{_libexecdir}/ConsoleKit \
|
||||
--with-check-accelerated-directory=%{_libexecdir} \
|
||||
--with-selinux \
|
||||
--enable-ipv6 \
|
||||
--with-plymouth \
|
||||
%if %{with_systemd}
|
||||
--with-systemd \
|
||||
%else
|
||||
@@ -265,7 +239,8 @@ autoreconf -f -i
|
||||
%else
|
||||
--disable-split-authentication \
|
||||
%endif
|
||||
--disable-scrollkeeper
|
||||
--disable-scrollkeeper \
|
||||
--with-initial-vt=7
|
||||
%__make %{?jobs:-j%jobs} V=1
|
||||
|
||||
%install
|
||||
@@ -290,7 +265,11 @@ cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
|
||||
# Pam config for autologin
|
||||
cp %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
|
||||
# Pam config for the greeter session
|
||||
cp %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/gdm-welcome
|
||||
cp %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/gdm-launch-environment
|
||||
# Pam config for fingerprint authentication
|
||||
cp %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/gdm-fingerprint
|
||||
# Pam config for smartcard authentication
|
||||
cp %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/gdm-smartcard
|
||||
# The default gdm pam configuration is the one to be used as pam-password too
|
||||
%if %{enable_split_authentication}
|
||||
rm $RPM_BUILD_ROOT/etc/pam.d/gdm-password
|
||||
@@ -301,9 +280,6 @@ ln -s gdm $RPM_BUILD_ROOT/etc/pam.d/gdm-password
|
||||
## Install other files
|
||||
# Install PostLogin script.
|
||||
mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default
|
||||
# Move gdmflexiserver to libexecdir and replace it with the compatibility wrapper
|
||||
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}%{_libexecdir}/X11/displaymanagers/gdm
|
||||
# Install other files
|
||||
@@ -357,9 +333,9 @@ dconf update
|
||||
%glib2_gsettings_schema_postun
|
||||
%icon_theme_cache_postun
|
||||
|
||||
%post -n libgdmgreeter1 -p /sbin/ldconfig
|
||||
%post -n libgdm1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgdmgreeter1 -p /sbin/ldconfig
|
||||
%postun -n libgdm1 -p /sbin/ldconfig
|
||||
|
||||
%post -n libgdmsimplegreeter1 -p /sbin/ldconfig
|
||||
|
||||
@@ -368,13 +344,7 @@ dconf update
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||
%dir %{_datadir}/gnome/
|
||||
%dir %{_datadir}/gnome/help/
|
||||
%dir %{_datadir}/gnome/help/%{name}/
|
||||
%doc %{_datadir}/gnome/help/%{name}/C/
|
||||
%dir %{_datadir}/omf/
|
||||
%dir %{_datadir}/omf/%{name}/
|
||||
%doc %{_datadir}/omf/%{name}/%{name}-C.omf
|
||||
%doc %{_datadir}/help/C/%{name}/
|
||||
%dir %config %{_sysconfdir}/gdm
|
||||
%config %{_sysconfdir}/gdm/[IPXl]*
|
||||
%{_sbindir}/gdm
|
||||
@@ -388,7 +358,6 @@ dconf update
|
||||
%{_datadir}/pixmaps/*.png
|
||||
%dir %{_libexecdir}/gdm
|
||||
%{_libexecdir}/gdm/gdm-*
|
||||
%{_libexecdir}/gdm/gdmflexiserver
|
||||
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm
|
||||
%ghost %attr(751,gdm,gdm) %dir %{_localstatedir}/run/gdm
|
||||
%attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm
|
||||
@@ -398,7 +367,7 @@ dconf update
|
||||
%config /etc/pam.d/gdm-fingerprint
|
||||
%config /etc/pam.d/gdm-password
|
||||
%config /etc/pam.d/gdm-smartcard
|
||||
%config /etc/pam.d/gdm-welcome
|
||||
%config /etc/pam.d/gdm-launch-environment
|
||||
%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
|
||||
%dir %config %{_sysconfdir}/dconf/db/gdm.d
|
||||
%dir %config %{_sysconfdir}/dconf/db/gdm.d/locks
|
||||
@@ -412,13 +381,13 @@ dconf update
|
||||
# Exclude simple-greeter extensions
|
||||
%exclude %{_datadir}/gdm/simple-greeter/extensions
|
||||
|
||||
%files -n libgdmgreeter1
|
||||
%files -n libgdm1
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libgdmgreeter.so.*
|
||||
%{_libdir}/libgdm.so.*
|
||||
|
||||
%files -n typelib-1_0-GdmGreeter-1_0
|
||||
%files -n typelib-1_0-Gdm-1_0
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib
|
||||
%{_libdir}/girepository-1.0/Gdm-1.0.typelib
|
||||
|
||||
%files -n libgdmsimplegreeter1
|
||||
%defattr(-,root,root)
|
||||
@@ -452,20 +421,16 @@ dconf update
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/gdm/
|
||||
%{_libdir}/libgdmgreeter.so
|
||||
%{_libdir}/libgdm.so
|
||||
%{_libdir}/libgdmsimplegreeter.so
|
||||
%{_libdir}/pkgconfig/gdmgreeter.pc
|
||||
%{_libdir}/pkgconfig/gdm.pc
|
||||
%{_libdir}/pkgconfig/gdmsimplegreeter.pc
|
||||
%{_datadir}/gir-1.0/GdmGreeter-1.0.gir
|
||||
%{_datadir}/gir-1.0/Gdm-1.0.gir
|
||||
|
||||
%files branding-upstream
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/gdm/custom.conf
|
||||
|
||||
%files -n gdmflexiserver
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/gdmflexiserver
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user