]> git.pld-linux.org Git - packages/gdm.git/blobdiff - gdm.spec
- updated to 46.0
[packages/gdm.git] / gdm.spec
index c9562c920f4f6952c98a1c6c157224080cd658c4..19b0a5dddfd9aeaefc0c5a949cfbeff19295b9bf 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -5,9 +5,9 @@
 #   gdm-autologin[4] gdm-fingerprint[10] gdm-password[1] gdm-smartcard gdm-launch-environment[11]
 #
 # Conditional build:
-%bcond_without  systemd # by default use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
+%bcond_without static_libs     # static library
 
-%define                glib2_version 1:2.36.0
+%define                glib2_ver       1:2.68.0
 Summary:       GNOME Display Manager
 Summary(es.UTF-8):     Administrador de Entrada del GNOME
 Summary(ja.UTF-8):     GNOME ディスプレイマネージャ
@@ -16,13 +16,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.16.1.1
+Version:       46.0
 Release:       1
 Epoch:         2
-License:       GPL/LGPL
+License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/3.16/%{name}-%{version}.tar.xz
-# Source0-md5: 0b315af5fe0ee66055edb6f301510820
+Source0:       https://download.gnome.org/sources/gdm/46/%{name}-%{version}.tar.xz
+# Source0-md5: 7c633379109fe5fb23734888649cdab0
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -35,30 +35,35 @@ Source11:   %{name}-launch-environment.pamd
 Patch0:                %{name}-xdmcp.patch
 Patch1:                %{name}-xsession.patch
 Patch2:                %{name}-defaults.patch
-Patch3:                shell-check.patch
-URL:           http://www.gnome.org/projects/gdm/
-BuildRequires: accountsservice-devel >= 0.6.12
+Patch3:                %{name}-both-libraries.patch
+URL:           https://wiki.gnome.org/Projects/GDM
+BuildRequires: accountsservice-devel >= 0.6.35
 BuildRequires: audit-libs-devel
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.11
 BuildRequires: check-devel >= 0.9.4
-BuildRequires: gettext-tools >= 0.17
-BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: dconf
+BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: glib2-devel >= %{glib2_ver}
 BuildRequires: gobject-introspection-devel >= 0.9.12
 BuildRequires: gtk+3-devel >= 3.0.0
-BuildRequires: intltool >= 0.40.0
 BuildRequires: iso-codes
+BuildRequires: json-glib-devel >= 1.2.0
+BuildRequires: keyutils-devel >= 1.6
 BuildRequires: libcanberra-gtk3-devel >= 0.4
+BuildRequires: libgudev-devel >= 232
 BuildRequires: libselinux-devel
-BuildRequires: libtool
+BuildRequires: libstdc++-devel
 BuildRequires: libwrap-devel
+BuildRequires: libxcb-devel
+BuildRequires: meson >= 0.57
+BuildRequires: ninja >= 1.5
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
 BuildRequires: plymouth-devel
 BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.627
-%{?with_systemd:BuildRequires: systemd-devel >= 1:186}
+BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: systemd-devel >= 1:209
 BuildRequires: tar >= 1:1.22
+BuildRequires: udev-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xorg-lib-libXdmcp-devel
@@ -66,10 +71,11 @@ BuildRequires:      xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXft-devel
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-xserver-Xephyr
+# for "XServer disables tcp access by default" detection
+BuildRequires: xorg-xserver-server-devel >= 1.17
 BuildRequires: xz
 BuildRequires: yelp-tools
-Requires(post,postun): glib2 >= %{glib2_version}
+Requires(post,postun): glib2 >= %{glib2_ver}
 Requires(post,postun): gtk-update-icon-cache
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -79,13 +85,17 @@ Requires(pre):      /usr/sbin/useradd
 Requires(posttrans):   dconf
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      /usr/bin/X
-Requires:      accountsservice >= 0.6.12
+Requires:      accountsservice >= 0.6.35
 Requires:      dbus-x11
 Requires:      gdm-wm >= 3.2.1
-Requires:      glib2 >= %{glib2_version}
-Requires:      gnome-session >= 3.0.0
-Requires:      gnome-settings-daemon >= 3.0.0
+Requires:      glib2 >= %{glib2_ver}
+Requires:      gnome-session >= 3.26.0
+Requires:      gnome-settings-daemon >= 3.26.0
 Requires:      hicolor-icon-theme
+Requires:      iso-codes
+Requires:      json-glib >= 1.2.0
+Requires:      libcanberra-gtk3 >= 0.4
+Requires:      libgudev >= 232
 Requires:      pam >= 0.99.7.1
 Requires:      polkit-gnome >= 0.93
 Requires:      which
@@ -94,18 +104,17 @@ Requires:  xorg-app-sessreg
 Requires:      xorg-app-xmodmap
 Suggests:      ConsoleKit-x11 >= 0.4.1
 Suggests:      pam-pam_gnome_keyring
-Suggests:      xorg-xserver-Xephyr
+Suggests:      xorg-xserver-Xephyr >= 1.17
 Suggests:      zenity
 Provides:      XDM
 Provides:      group(xdm)
 Provides:      user(xdm)
-Obsoletes:     gdm-Xnest
-Obsoletes:     gdm-systemd
-Obsoletes:     gdm-user-switch-applet
-Obsoletes:     gnome-applet-fast-user-switch
+Obsoletes:     gdm-Xnest < 2:2.28
+Obsoletes:     gdm-systemd < 2:3.2.1.1-10
+Obsoletes:     gdm-upstart < 2:3.20
+Obsoletes:     gdm-user-switch-applet < 2:3.0.0-2
+Obsoletes:     gnome-applet-fast-user-switch < 2.21
 Conflicts:     gdkxft
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
 Conflicts:     systemd < 186
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -143,10 +152,28 @@ GDM (GNOME Display Manager) - це реімплементація xdm (X Display
 Manager). GDM дозволяє вам входити в систему, на якій запущено X
 Window та підтримує роботу кількох різних X сеансів одночасно.
 
+%package init
+Summary:       Init script for GDM
+Summary(pl.UTF-8):     Skrypt init dla GDM-a
+Group:         X11/Applications
+Requires(post,preun):  /sbin/chkconfig
+Requires(post,preun,postun):   systemd-units >= 38
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      open
+Requires:      rc-scripts >= 0.4.3.0
+Requires:      systemd-units >= 38
+
+%description init
+Init script for GDM.
+
+%description init -l pl.UTF-8
+Skrypt init dla GDM-a.
+
 %package libs
 Summary:       GDM libraries
 Summary(pl.UTF-8):     Biblioteki GDM
 Group:         Libraries
+Requires:      glib2 >= %{glib2_ver}
 
 %description libs
 GDM libraries.
@@ -159,6 +186,9 @@ Summary:    Header files for GDM
 Summary(pl.UTF-8):     Pliki nagłówkowe i dokumentacja
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      glib2-devel >= %{glib2_ver}
+Requires:      libselinux-devel
+Requires:      systemd-devel >= 1:209
 
 %description devel
 This package contains the files necessary to develop applications
@@ -180,67 +210,36 @@ This package contains static libraries for GDM.
 %description static -l pl.UTF-8
 Pakiet zawiera statyczne biblioteki GDM.
 
-%package init
-Summary:       Init script for GDM
-Summary(pl.UTF-8):     Skrypt init dla GDM-a
-Group:         X11/Applications
-Requires(post,preun):  /sbin/chkconfig
-Requires(post,preun,postun):   systemd-units >= 38
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      open
-Requires:      rc-scripts >= 0.4.3.0
-Requires:      systemd-units >= 38
-
-%description init
-Init script for GDM.
-
-%description init -l pl.UTF-8
-Skrypt init dla GDM-a.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#patch3 -p1
+%patch3 -p1
 
 %build
-touch data/gdm.schemas.in.in
-%{__libtoolize}
-%{__glib_gettextize}
-%{__intltoolize}
-%{__aclocal}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-%configure \
-       SYSTEMD_X_SERVER=/lib/systemd/systemd-multi-seat-x \
-       %{?debug:--enable-debug} \
-       --disable-console-helper \
-       --disable-silent-rules \
-       %{__with_without systemd systemd} \
-       --with-console-kit \
-       --enable-authentication-scheme=pam \
-       --with-pam-prefix=/etc \
-       --with-tcp-wrappers=yes \
-       --with-xdmcp=yes \
-       --with-xinerama=yes \
-       --with-user=xdm \
-       --with-group=xdm \
-       --enable-ipv6
-
-%{__make} -j1
+%meson build \
+       %{!?with_static_libs:--default-library=shared} \
+       -Dgdm-xsession=true \
+       -Dgroup=xdm \
+       -Dinitial-vt=9 \
+       -Dipv6=true \
+       -Dpam-mod-dir=/%{_lib}/security \
+       -Dpam-prefix=/etc \
+       -Dtcp-wrappers=true \
+       -Dudev-dir=/lib/udev/rules.d \
+       -Duser=xdm
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
-       $RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
-       $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{systemdunitdir}} \
+       $RPM_BUILD_ROOT{/home/services/xdm,/var/lib/gdm/.local,/var/log/gdm,/var/run/gdm/greeter} \
+       $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/xsessions,%{systemdunitdir}} \
        $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       PAM_PREFIX=%{_sysconfdir}
+%ninja_install -C build
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm-password
 cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/gdm-fingerprint
@@ -248,19 +247,19 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/pam.d/gdm-launch-environment
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
-ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
+# replace file with mask (to allow choosing via prefdm.service)
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
+
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
-%find_lang %{name} --with-gnome --with-omf --all-name
+%find_lang %{name} --with-gnome
 
 # allow executing ~/.Xclients and ~/.xsession
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -284,7 +283,7 @@ fi
 
 %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
+       mv -f /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
 fi
 
 %post init
@@ -314,15 +313,19 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS MAINTAINERS NEWS README.md
 %attr(755,root,root) %{_sbindir}/gdm
+%attr(755,root,root) %{_bindir}/gdm-config
 %attr(755,root,root) %{_bindir}/gdm-screenshot
 %attr(755,root,root) %{_bindir}/gdmflexiserver
 %attr(755,root,root) %{_libexecdir}/gdm-host-chooser
+%attr(755,root,root) %{_libexecdir}/gdm-runtime-config
 %attr(755,root,root) %{_libexecdir}/gdm-session-worker
 %attr(755,root,root) %{_libexecdir}/gdm-simple-chooser
-%attr(755,root,root) %{_libdir}/gdm-wayland-session
-%attr(755,root,root) %{_libdir}/gdm-x-session
+%attr(755,root,root) %{_libexecdir}/gdm-wayland-session
+%attr(755,root,root) %{_libexecdir}/gdm-x-session
+%attr(755,root,root) /%{_lib}/security/pam_gdm.so
+/lib/udev/rules.d/61-gdm.rules
 %dir %{_sysconfdir}/gdm
 %dir %{_sysconfdir}/gdm/Init
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
@@ -331,12 +334,13 @@ fi
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
 %dir %{_sysconfdir}/gdm/PostLogin
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
+%attr(640,root,xdm) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/gdm.conf
 %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
 %{_datadir}/dconf/profile/gdm
-%attr(1755,root,xdm) %dir /var/cache/gdm
+%dir %{systemduserunitdir}/gnome-session@gnome-login.target.d
+%{systemduserunitdir}/gnome-session@gnome-login.target.d/session.conf
 %attr(1770,root,xdm) %dir /var/lib/gdm
 %attr(755,xdm,xdm) /var/lib/gdm/.local
 %attr(750,xdm,xdm) %dir /var/log/gdm
@@ -344,13 +348,16 @@ fi
 %attr(755,xdm,xdm) %dir /var/run/gdm/greeter
 %attr(750,xdm,xdm) /home/services/xdm
 %{systemdtmpfilesdir}/%{name}.conf
-%{_pixmapsdir}/gdm*.png
-%{_pixmapsdir}/nobody.png
-%{_pixmapsdir}/nohost.png
+%{_pixmapsdir}/gdm-pld-logo.png
 %{_datadir}/gdm
+%{_datadir}/gnome-session/sessions/gnome-login.session
 %{_datadir}/xsessions/custom.desktop
 %{_datadir}/xsessions/default.desktop
-%{_iconsdir}/hicolor/*x*/apps/gdm-*.png
+
+%files init
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/gdm
+%{systemdunitdir}/gdm.service
 
 %files libs
 %defattr(644,root,root,755)
@@ -362,19 +369,11 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgdm.so
-%dir %{_includedir}/gdm
-%{_includedir}/gdm/gdm-client-glue.h
-%{_includedir}/gdm/gdm-client.h
-%{_includedir}/gdm/gdm-sessions.h
-%{_includedir}/gdm/gdm-user-switching.h
+%{_includedir}/gdm
 %{_pkgconfigdir}/gdm.pc
+%{_pkgconfigdir}/gdm-pam-extensions.pc
 %{_datadir}/gir-1.0/Gdm-1.0.gir
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgdm.a
-
-%files init
-%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/gdm
-%{systemdunitdir}/gdm.service
This page took 0.050226 seconds and 4 git commands to generate.