#
-# BIG FAT WARNING!
-#
-# Merged to HEAD with RM's permission. If you need GDM 2.20,
-# create a separate spec for your personal use (like gdm-220.spec)
-#
# TODO:
# - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
# - check /etc/pam.d/gdm-autologin
Summary(pt_BR.UTF-8): Gerenciador de Entrada do GNOME
Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
-Name: gdm
-Version: 2.28.1
-Release: 2
-Epoch: 2
+Name: gdm2.20
+Version: 2.20.11
+Release: 5
License: GPL/LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 917dc80f5ef6adcdc15193de238476db
-Source1: %{name}.pamd
-Source2: %{name}.init
-Source3: %{name}-pld-logo.png
-#Source4: %{name}-autologin.pamd
-Source5: %{name}-custom.desktop
-Source6: %{name}-default.desktop
-Patch0: %{name}-xdmcp.patch
-Patch1: %{name}-polkit.patch
-Patch2: %{name}-xsession.patch
-Patch4: %{name}-defaults.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=597050
-Patch5: %{name}-dont-hardcode-path.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
+# Source0-md5: 67696b64c81c317f61065810a32e8b36
+Source1: gdm.pamd
+Source2: gdm.init
+Source3: gdm-pld-logo.png
+# http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-artwork/gdm/storky/
+Source4: gdm-storky.tar.gz
+# Source4-md5: e293fbe4a60004056f6894463b874ae8
+Source5: gdm-autologin.pamd
+Patch0: gdm-xdmcp.patch
+Patch1: gdm-conf.patch
+Patch2: gdm-xsession.patch
+Patch3: gdm-desktop.patch
+Patch4: gdm-defaults.patch
URL: http://www.gnome.org/projects/gdm/
-BuildRequires: ConsoleKit-devel >= 0.4.1
-BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: ConsoleKit-devel
BuildRequires: attr-devel
BuildRequires: audit-libs-devel
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.9
-BuildRequires: check >= 0.9.4
-BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: autoconf >= 2.52
+BuildRequires: automake
+BuildRequires: dbus-glib-devel >= 0.73
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: gnome-common
BuildRequires: gnome-doc-utils
-BuildRequires: gnome-panel-devel >= 2.24.0
-BuildRequires: gtk+2-devel >= 2:2.14.0
-BuildRequires: intltool >= 0.40.0
-BuildRequires: iso-codes
-BuildRequires: libcanberra-gtk-devel >= 0.4
+BuildRequires: gtk+2-devel >= 2:2.12.0
+BuildRequires: intltool >= 0.36.1
+BuildRequires: libart_lgpl-devel >= 2.3.19
BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.20.0
+BuildRequires: libgsf-devel >= 1.14.6
+BuildRequires: librsvg-devel >= 1:2.18.1
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool
-BuildRequires: libxklavier-devel >= 4.0-2
+BuildRequires: libxml2-devel >= 1:2.6.29
BuildRequires: pam-devel
BuildRequires: perl-modules
BuildRequires: pkgconfig
-BuildRequires: polkit-gnome-devel >= 0.92
BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.627
BuildRequires: scrollkeeper
+BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libXdmcp-devel
BuildRequires: xorg-lib-libXi-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libdmx-devel
-Requires(post,preun): GConf2
+BuildRequires: zenity
Requires(post,postun): /usr/bin/scrollkeeper-update
-Requires(post,postun): gtk+2
+Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: /usr/bin/Xorg
-Requires: gnome-session >= 2.24.0
-Requires: gnome-settings-daemon >= 2.24.0
+Requires(post,preun,postun): systemd-units >= 38
+Requires: libgnomeui >= 2.20.0
Requires: pam >= 0.99.7.1
-Requires: polkit-gnome >= 0.92
+Requires: systemd-units >= 38
Requires: which
+Requires: xinitrc-ng >= 1.0
Requires: xorg-app-sessreg
Requires: xorg-app-xmodmap
Suggests: zenity
Provides: XDM
+Provides: gdm = 2:%{version}
Provides: group(xdm)
Provides: user(xdm)
-Obsoletes: gdm-Xnest
+Obsoletes: gdm <= 2:%{version}
Conflicts: gdkxft
+Conflicts: gdm > 2:%{version}
# sr@Latn vs. sr@latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _localstatedir /var/lib
+
%description
Gdm (the GNOME Display Manager) is a highly configurable
reimplementation of xdm, the X Display Manager. Gdm allows you to log
Manager). GDM дозволяє вам входити в систему, на якій запущено X
Window та підтримує роботу кількох різних X сеансів одночасно.
+%package Xnest
+Summary: Xnest (ie embedded X) server for GDM
+Summary(pl.UTF-8): Serwer Xnest dla GDM
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+Requires: xorg-xserver-Xnest
+Obsoletes: gdm-Xnest <= 2:%{version}
+
+%description Xnest
+This package add support for Xnest server in gdm.
+
+%description Xnest -l pl.UTF-8
+Ten pakiet dodaje do gdm wsparcie dla Xnest.
+
%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: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: open
+Obsoletes: gdm-init <= 2:%{version}
+Conflicts: gdm-init > 2:%{version}
%description init
Init script for GDM.
%description init -l pl.UTF-8
Skrypt init dla GDM-a.
-%package user-switch-applet
-Summary: GNOME applet for fast user switching
-Summary(pl.UTF-8): Aplet GNOME do szybkiego przełączania użytkowników
-Group: X11/Applications
-Requires: gdm >= 2:2.22.0
-Provides: gnome-applet-fast-user-switch = %{epoch}:%{version}-%{release}
-Obsoletes: gnome-applet-fast-user-switch
-
-%description user-switch-applet
-The GDM User Switch Applet is an applet for the GNOME panel which
-provides a mechanism for switching between users.
-
-%description user-switch-applet -l pl.UTF-8
-GDM User Switch Applet to aplet panelu GNOME udostępniający mechanizm
-do przełączania między użytkownikami.
-
%prep
-%setup -q
+%setup -q -a4 -n gdm-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
-%patch5 -p1
-rm -f data/gdm.schemas.in
+
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
%build
%{__libtoolize}
%{__glib_gettextize}
%{__intltoolize}
%{__aclocal}
-%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
+ LIBS="-lXau" \
--disable-console-helper \
--disable-scrollkeeper \
- --with-console-kit \
+ --with-console-kit=yes \
--enable-authentication-scheme=pam \
+ --enable-secureremote \
--with-pam-prefix=/etc \
--with-tcp-wrappers=yes \
--with%{!?with_selinux:out}-selinux \
+ --with-libaudit=yes \
--with-xdmcp=yes \
--with-xinerama=yes \
- --with-user=xdm \
- --with-group=xdm
+ --with-dmx=yes \
+ --enable-ipv6=yes
%{__make}
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
+ $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky \
+ $RPM_BUILD_ROOT%{systemdunitdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
PAM_PREFIX=/etc
+mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/xsessions
+
install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
-#install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
+
+install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
+
touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
-%find_lang %{name} --with-gnome --with-omf --all-name
+%find_lang gdm --with-gnome --with-omf --all-name
+
+# Remove useless files
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
-# allow executing ~/.Xclients and ~/.xsession
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
-install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
+# moved to gnome-session
+rm $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
%post
-%gconf_schema_install gdm-simple-greeter.schemas
%scrollkeeper_update_post
%update_icon_cache hicolor
-
-%preun
-%gconf_schema_uninstall gdm-simple-greeter.schemas
+%systemd_reload
%postun
%scrollkeeper_update_postun
%update_icon_cache hicolor
+%systemd_reload
if [ "$1" = "0" ]; then
%userremove xdm
%groupremove xdm
fi
-%triggerpostun -- %{name} < 1:2.13.0.8-1
+%triggerpostun -- gdm < 1:2.13.0.8-1
if [ -f /etc/X11/gdm/gdm.conf-custom.rpmsave ]; then
mv /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
fi
/sbin/chkconfig --del gdm
fi
-%files -f %{name}.lang
+%files -f gdm.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_libexecdir}/gdm-crash-logger
-%attr(755,root,root) %{_libexecdir}/gdm-factory-slave
-%attr(755,root,root) %{_libexecdir}/gdm-host-chooser
-%attr(755,root,root) %{_libexecdir}/gdm-product-slave
-%attr(755,root,root) %{_libexecdir}/gdm-session-worker
-%attr(755,root,root) %{_libexecdir}/gdm-simple-chooser
-%attr(755,root,root) %{_libexecdir}/gdm-simple-greeter
-%attr(755,root,root) %{_libexecdir}/gdm-simple-slave
-%attr(755,root,root) %{_libexecdir}/gdm-xdmcp-chooser-slave
+%attr(755,root,root) %{_bindir}/gdm-dmx-reconnect-proxy
+%attr(755,root,root) %{_bindir}/gdmdynamic
+%attr(755,root,root) %{_bindir}/gdmflexiserver
+%attr(755,root,root) %{_bindir}/gdmphotosetup
+%attr(755,root,root) %{_bindir}/gdmthemetester
+%attr(755,root,root) %{_libdir}/gdm-ssh-session
+%attr(755,root,root) %{_libdir}/gdmaskpass
+%attr(755,root,root) %{_libdir}/gdmopen
+%attr(755,root,root) %{_libdir}/gdmtranslate
+%attr(755,root,root) %{_libdir}/gdmchooser
+%attr(755,root,root) %{_libdir}/gdmgreeter
+%attr(755,root,root) %{_libdir}/gdmlogin
%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_bindir}/*
+
+%{systemdunitdir}/gdm.service
%dir %{_sysconfdir}/gdm
%dir %{_sysconfdir}/gdm/Init
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
-%attr(755,root,root) %config %{_sysconfdir}/gdm/PreSession
-%attr(755,root,root) %config %{_sysconfdir}/gdm/PostSession
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
+%dir %{_sysconfdir}/gdm/PreSession
+%dir %{_sysconfdir}/gdm/PostSession
%dir %{_sysconfdir}/gdm/PostLogin
-%config %{_sysconfdir}/gdm/PostLogin/Default.sample
+%dir %{_sysconfdir}/gdm/modules
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/Init/Default
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/PostLogin/Default.sample
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/PostSession/Default
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/PreSession/Default
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/XKeepsCrashing
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/Xsession
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
-%{_sysconfdir}/gdm/gdm.schemas
-%{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/locale.alias
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/modules/*
+
%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
-%attr(1770,root,xdm) %{_localstatedir}/gdm
-%attr(1755,root,xdm) %{_localstatedir}/cache/gdm
-%attr(1770,root,xdm) %dir %{_localstatedir}/lib/gdm
-%attr(1750,root,xdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
-%attr(1640,root,xdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
-%attr(644,root,xdm) %{_localstatedir}/lib/gdm/.gconf.path
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
-%attr(1777,root,xdm) %{_localstatedir}/run/gdm
+%attr(1770,root,xdm) /var/lib/gdm
+%attr(750,xdm,xdm) /var/log/gdm
%attr(750,xdm,xdm) /home/services/xdm
%{_pixmapsdir}/*
%{_datadir}/gdm
-%{_datadir}/polkit-1/actions/gdm.policy
-%{_datadir}/xsessions/custom.desktop
%{_datadir}/xsessions/default.desktop
+%{_datadir}/xsessions/ssh.desktop
%{_iconsdir}/hicolor/*/apps/*.png
+%{_iconsdir}/hicolor/*/apps/*.svg
+%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
+%{_mandir}/man1/gdm*
-%files init
+%files Xnest
%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/gdm
+%attr(755,root,root) %{_bindir}/gdmXnest
+%attr(755,root,root) %{_bindir}/gdmXnestchooser
-%files user-switch-applet
+%files init
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gdm-user-switch-applet
-%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+%attr(754,root,root) /etc/rc.d/init.d/gdm
projects / packages / gdm2.20.git / blobdiff