Accepting request 537833 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/537833
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=360

gdm.spec

@@ -25,13 +25,13 @@
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        3.26.1
+Version:        3.26.2
 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.26/%{name}-%{version}.tar.xz
+Url:            https://wiki.gnome.org/Projects/GDM
+Source:         https://download.gnome.org/sources/gdm/3.26/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
 Source3:        gdm-launch-environment.pamd
@@ -71,14 +71,11 @@ BuildRequires:  check-devel
 BuildRequires:  dconf
 BuildRequires:  gnome-common
 # needed for directory ownership
+BuildRequires:  fdupes
 BuildRequires:  gnome-session-core
-BuildRequires:  gobject-introspection-devel >= 0.9.12
-BuildRequires:  iso-codes-devel
 BuildRequires:  keyutils-devel
-BuildRequires:  libXdmcp-devel
-BuildRequires:  libXi-devel
-BuildRequires:  libXinerama-devel
 BuildRequires:  pam-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pwdutils
 BuildRequires:  tcpd-devel
 %if !0%{?is_opensuse}
@@ -87,19 +84,31 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-server
 BuildRequires:  xorg-x11-server-extra
-BuildRequires:  pkgconfig(accountsservice)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(libcanberra-gtk3)
+BuildRequires:  pkgconfig(accountsservice) >= 0.6.35
+BuildRequires:  pkgconfig(check)
+BuildRequires:  pkgconfig(gio-2.0) >= 2.36.0
+BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.36.0
+BuildRequires:  pkgconfig(glib-2.0) >= 2.36.0
+BuildRequires:  pkgconfig(gobject-2.0) >= 2.36.0
+BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 0.9.12
+BuildRequires:  pkgconfig(gthread-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 2.91.1
+BuildRequires:  pkgconfig(iso-codes)
+BuildRequires:  pkgconfig(libcanberra-gtk3) >= 0.4
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(ply-boot-client)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xau)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xdmcp)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xinerama)
 %ifnarch s390 s390x
 BuildRequires:  pkgconfig(xorg-server)
 %endif
 BuildRequires:  pkgconfig(xrandr)
 Requires(pre):  group(video)
-Requires:       %{name}-branding = %{version}
+Requires:       %{name}-branding = 3.26.2
 Requires:       gdmflexiserver
 Requires:       gnome-session-core
 Requires:       gnome-settings-daemon
@@ -119,7 +128,6 @@ Obsoletes:      gnome-applets-gdm < %{version}
 Obsoletes:      gdmflexiserver < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 DocDir:         %{_defaultdocdir}
-%glib2_gsettings_schema_requires
 
 %description
 The GNOME Display Manager is a system service that is responsible for
@@ -247,32 +255,32 @@ find %{buildroot} -name '*.la' -type f -delete -print
 # Do not ship the systemd.service file: openSUSE uses xdm, which enables the DM based on sysconfig.
 rm %{buildroot}%{systemdsystemunitdir}/gdm.service
 ## Install PAM files.
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+mkdir -p %{buildroot}/etc/pam.d
 # Generic pam config
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
+cp %{SOURCE1} %{buildroot}/etc/pam.d/gdm
 # Pam config for autologin
-cp %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
+cp %{SOURCE2} %{buildroot}/etc/pam.d/gdm-autologin
 # Pam config for the greeter session
-cp %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/gdm-launch-environment
+cp %{SOURCE3} %{buildroot}/etc/pam.d/gdm-launch-environment
 %if %{enable_split_authentication}
 # Pam config for fingerprint authentication
-cp %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/gdm-fingerprint
+cp %{SOURCE6} %{buildroot}/etc/pam.d/gdm-fingerprint
 # Pam config for smartcard authentication
-cp %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/gdm-smartcard
+cp %{SOURCE7} %{buildroot}/etc/pam.d/gdm-smartcard
 %endif
 # 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
+rm %{buildroot}/etc/pam.d/gdm-password
 echo "We are not ready for this, we need to know what to put in gdm-fingerprint and gdm-smartcard pam config files."
 false
 %endif
-ln -s gdm $RPM_BUILD_ROOT/etc/pam.d/gdm-password
+ln -s gdm %{buildroot}/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
+mv %{buildroot}%{_sysconfdir}/gdm/PostLogin/Default.sample %{buildroot}%{_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
+mv %{buildroot}%{_bindir}/gdmflexiserver %{buildroot}%{_libexecdir}/gdm/gdmflexiserver
+install -m 755 %{SOURCE4} %{buildroot}%{_bindir}/gdmflexiserver
 #Install /etc/xinit.d/xdm integration script
 install -D -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
@@ -280,14 +288,15 @@ touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
 ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
 
 # Install other files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/gdm
-mkdir -p $RPM_BUILD_ROOT/run/gdm
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm
+mkdir -p %{buildroot}%{_localstatedir}/log/gdm
+mkdir -p %{buildroot}/run/gdm
+mkdir -p %{buildroot}%{_bindir}
+ln -s ../sbin/gdm %{buildroot}%{_bindir}/gdm
 %find_lang %{name} %{?no_lang_C}
+%fdupes -s %{buildroot}%{_datadir}/help
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
 /usr/sbin/groupadd -r gdm 2> /dev/null || :
@@ -386,6 +395,7 @@ dconf update
 %{_includedir}/gdm/
 %{_libdir}/libgdm.so
 %{_libdir}/pkgconfig/gdm.pc
+%{_libdir}/pkgconfig/gdm-pam-extensions.pc
 %{_datadir}/gir-1.0/Gdm-1.0.gir
 
 %files branding-upstream