|
@@ -1,51 +1,111 @@
|
|
|
-%define pango_version 1.22.0
|
|
|
-%define gtk2_version 2.14.0
|
|
|
-%define libglade2_version 2.6.0
|
|
|
-%define librsvg2_version 2.22.0
|
|
|
-%define libxml2_version 2.5.10
|
|
|
-%define rarian 0.8
|
|
|
-%define pam_version 0.99.8
|
|
|
-%define desktop_file_utils_version 0.3
|
|
|
-%define gail_version 1.18.0
|
|
|
-%define consolekit_version 0.2.7
|
|
|
-%define hal_version 0.5.9
|
|
|
-
|
|
|
-Summary: The GNOME Display Manager.
|
|
|
+%define libauditver 1.0.6
|
|
|
+%define pango_version 1.2.0
|
|
|
+%define gtk3_version 2.99.2
|
|
|
+%define libglade2_version 2.0.0
|
|
|
+%define libgnomeui_version 2.2.0
|
|
|
+%define scrollkeeper_version 0.3.4
|
|
|
+%define pam_version 0.99.8.1-11
|
|
|
+%define desktop_file_utils_version 0.2.90
|
|
|
+%define gail_version 1.2.0
|
|
|
+%define nss_version 3.11.1
|
|
|
+%define consolekit_version 0.3.0-9
|
|
|
+%define fontconfig_version 2.6.0
|
|
|
+
|
|
|
+%define _default_patch_fuzz 999
|
|
|
+
|
|
|
+Summary: The GNOME Display Manager
|
|
|
Summary(ja): GNOME ディスプレイマネージャ
|
|
|
Name: gdm
|
|
|
-Version: 2.32.2
|
|
|
-Release: 6%{?_dist_release}
|
|
|
-License: LGPL/GPL
|
|
|
+Version: 3.1.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
+License: GPLv2+
|
|
|
Group: User Interface/X
|
|
|
-URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/
|
|
|
+URL: http://download.gnome.org/sources/gdm
|
|
|
|
|
|
-Source: %{name}-%{version}.tar.xz
|
|
|
+Source: http://download.gnome.org/sources/gdm/2.91/gdm-%{version}.tar.xz
|
|
|
Source1: gdm-pam
|
|
|
Source2: gdm-autologin-pam
|
|
|
-Source10: polkit-gnome-authentication-agent-1.desktop
|
|
|
-
|
|
|
-Source110: gnome.desktop
|
|
|
-Source130: gdm-2.32.2-ja.po
|
|
|
+Source3: gdm-welcome-pam
|
|
|
+Source4: gdm-password.pam
|
|
|
+Source5: gdm-smartcard.pam
|
|
|
+Source6: gdm-fingerprint.pam
|
|
|
+Source7: gdm-smartcard-16.png
|
|
|
+Source8: gdm-smartcard-48.png
|
|
|
+Source9: gdm-fingerprint-16.png
|
|
|
+Source10: gdm-fingerprint-48.png
|
|
|
+Source11: polkit-gnome-authentication-agent-1.desktop
|
|
|
|
|
|
Source200: gdm-restart
|
|
|
Source201: gdm-safe-restart
|
|
|
Source202: gdm-stop
|
|
|
+Source203: gnome.desktop
|
|
|
+
|
|
|
+Source210: gdm.master.ja.po
|
|
|
+
|
|
|
+
|
|
|
+Requires(pre): shadow-utils
|
|
|
+Requires: pam >= %{pam_version}
|
|
|
+Requires: ConsoleKit >= %{consolekit_version}
|
|
|
+Requires: accountsservice
|
|
|
+Requires: iso-codes
|
|
|
+Requires: gnome-keyring-pam
|
|
|
+Requires: gnome-session
|
|
|
+Requires: gnome-settings-daemon
|
|
|
+Requires: polkit-gnome
|
|
|
+Requires: pulseaudio-gdm-hooks
|
|
|
+Requires: usermode-gtk
|
|
|
+Requires: util-linux
|
|
|
+Requires: xinitrc
|
|
|
+Requires: xorg-x11-xdm
|
|
|
+Requires: vine-backgrounds >= 4.0
|
|
|
+Requires: libXau >= 1.0.4-4
|
|
|
+Requires: audit-libs >= %{libauditver}
|
|
|
+
|
|
|
+BuildRequires: libcanberra-gtk3-devel
|
|
|
+BuildRequires: scrollkeeper >= %{scrollkeeper_version}
|
|
|
+BuildRequires: pango-devel >= %{pango_version}
|
|
|
+BuildRequires: gtk3-devel >= %{gtk3_version}
|
|
|
+BuildRequires: pam-devel >= %{pam_version}
|
|
|
+BuildRequires: fontconfig >= %{fontconfig_version}
|
|
|
+BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
+BuildRequires: libtool automake autoconf
|
|
|
+BuildRequires: libattr-devel
|
|
|
+BuildRequires: gettext
|
|
|
+BuildRequires: gnome-doc-utils
|
|
|
+BuildRequires: libdmx-devel
|
|
|
+BuildRequires: audit-libs-devel >= %{libauditver}
|
|
|
+BuildRequires: autoconf automake libtool
|
|
|
+BuildRequires: intltool
|
|
|
+BuildRequires: xorg-x11-server-Xorg
|
|
|
+BuildRequires: nss-devel >= %{nss_version}
|
|
|
+BuildRequires: ConsoleKit
|
|
|
+BuildRequires: check-devel
|
|
|
+BuildRequires: iso-codes
|
|
|
+BuildRequires: libxklavier-devel >= 4.0
|
|
|
+BuildRequires: upower-devel >= 0.9.7
|
|
|
+BuildRequires: libXdmcp-devel
|
|
|
+BuildRequires: dbus-glib-devel
|
|
|
+BuildRequires: GConf2-devel
|
|
|
+BuildRequires: accountsservice-devel
|
|
|
+
|
|
|
+# these are all just for rebuilding dconf-override-db
|
|
|
+BuildRequires: dbus-x11
|
|
|
+BuildRequires: dconf
|
|
|
+BuildRequires: gnome-power-manager
|
|
|
+BuildRequires: gsettings-desktop-schemas
|
|
|
+BuildRequires: gnome-settings-daemon
|
|
|
+
|
|
|
+
|
|
|
+# Patch from Fedora
|
|
|
+Patch0: fix-build.patch
|
|
|
+Patch1: disable-fatal-criticals.patch
|
|
|
+Patch2: 0001-welcome-register-in-PAM-in-addition-to-ConsoleKit.patch
|
|
|
|
|
|
-## patches from fedora
|
|
|
-# Fedora-specific
|
|
|
-Patch97: gdm-bubble-location.patch
|
|
|
-Patch98: tray-padding.patch
|
|
|
+Patch98: plymouth.patch
|
|
|
|
|
|
-## patches from ubuntu
|
|
|
-Patch102: 02_x_server_location.patch
|
|
|
+# Patch from Ubuntu
|
|
|
Patch105: 05_initial_server_on_vt7.patch
|
|
|
-Patch108: 08_use_polkit_for_settings.patch
|
|
|
-Patch117: 17_use_timed_login_after_autologin.patch
|
|
|
-Patch127: 27_save_root_window.patch
|
|
|
-Patch128: 28_plymouth_transition.patch
|
|
|
-Patch132: 32-hide-mouse-cursor.patch
|
|
|
Patch134: 34_disable_a11y_default.patch
|
|
|
-Patch138: 38_user_chooser_focus.patch
|
|
|
|
|
|
## patches for vine
|
|
|
Patch500: gdm-2.32.1-vine-release.patch
|
|
@@ -54,120 +114,91 @@ Patch500: gdm-2.32.1-vine-release.patch
|
|
|
## http://git.gnome.org/browse/gdm/commit/?h=gnome-2-28&id=98a1649b17320957b9a2521af07d15ba51c187c9
|
|
|
Patch501: gdm-2.32.0-greeter-login-window-be-dock.patch
|
|
|
|
|
|
-# add translatable tag
|
|
|
-Patch502: gdm-2.32.2-simple-greeter-vine.patch
|
|
|
-
|
|
|
# disable metacity compositing_manager on gdm
|
|
|
Patch503: gdm-2.32.2-disable-metacity-compositing_manager.patch
|
|
|
|
|
|
# use start-here logo (distro logo) on simple greeter panel instead of computer
|
|
|
Patch504: gdm-2.32.2-simple-greeter-logo.patch
|
|
|
|
|
|
-# fix login dialog focus problem
|
|
|
-# re-enable upstream change.
|
|
|
-# http://git.gnome.org/browse/gdm/commit/?id=bc78b6c7fc40a6388ddb194461b7b5d140acd8d0
|
|
|
-Patch505: gdm-2.32.2-fix-login-dialog-focus.patch
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
|
|
|
-# security fix
|
|
|
|
|
|
+%description
|
|
|
+GDM provides the graphical login screen, shown shortly after boot up,
|
|
|
+log out, and when user-switching.
|
|
|
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+%package plugin-smartcard
|
|
|
+Summary: GDM smartcard plugin
|
|
|
+Group: User Interface/Desktops
|
|
|
+Requires: gdm = %{version}-%{release}
|
|
|
+Requires: pam_pkcs11
|
|
|
|
|
|
-Requires(pre): shadow-utils
|
|
|
-Requires: pam >= %{pam_version}
|
|
|
-Requires: hal >= %{hal_version}
|
|
|
-Requires: ConsoleKit >= %{consolekit_version}
|
|
|
-Requires: usermode-gtk
|
|
|
-Requires: xinitrc
|
|
|
-Requires: xorg-x11-xdm
|
|
|
-Requires: util-linux
|
|
|
-Requires: vine-backgrounds >= 4.0
|
|
|
-Requires: gnome-settings-daemon
|
|
|
-Requires: polkit-gnome
|
|
|
-Requires: iso-codes
|
|
|
-Requires: gnome-session
|
|
|
-Requires: gnome-keyring-pam
|
|
|
-BuildRequires: scrollkeeper >= %{scrollkeeper_version}
|
|
|
-BuildRequires: pango-devel >= %{pango_version}
|
|
|
-BuildRequires: gtk2-devel >= %{gtk2_version}
|
|
|
-BuildRequires: libglade2-devel >= %{libglade2_version}
|
|
|
-BuildRequires: librsvg2-devel >= %{librsvg2_version}
|
|
|
-BuildRequires: libxml2-devel >= %{libxml2_version}
|
|
|
-BuildRequires: usermode
|
|
|
-BuildRequires: pam-devel >= %{pam_version}
|
|
|
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
-BuildRequires: gail-devel >= %{gail_version}
|
|
|
-BuildRequires: libtool, automake, autoconf
|
|
|
-BuildRequires: ConsoleKit
|
|
|
-BuildRequires: libdmx-devel, audit-libs-devel
|
|
|
-BuildRequires: libcanberra-devel
|
|
|
-BuildRequires: polkit-devel
|
|
|
-BuildRequires: gnome-panel-devel
|
|
|
-BuildRequires: libxklavier-devel
|
|
|
-BuildRequires: upower-devel
|
|
|
-BuildRequires: libXdmcp-devel
|
|
|
-BuildRequires: check-devel
|
|
|
-BuildRequires: libICE-devel
|
|
|
-BuildRequires: gnome-doc-utils
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
-Packager: daisuke
|
|
|
+%description plugin-smartcard
|
|
|
+The GDM smartcard plugin provides functionality necessary to use a smart card with GDM.
|
|
|
|
|
|
-%description
|
|
|
-Gdm (the GNOME Display Manager) is a highly configurable
|
|
|
-reimplementation of xdm, the X Display Manager. Gdm allows you to log
|
|
|
-into your system with the X Window System running and supports running
|
|
|
-several different X sessions on your local machine at the same time.
|
|
|
+%package plugin-fingerprint
|
|
|
+Summary: GDM fingerprint plugin
|
|
|
+Group: User Interface/Desktops
|
|
|
+Requires: gdm = %{version}-%{release}
|
|
|
+Requires: fprintd-pam
|
|
|
|
|
|
-%prep
|
|
|
-%setup -q
|
|
|
+%description plugin-fingerprint
|
|
|
+The GDM fingerprint plugin provides functionality necessary to use a fingerprint reader with GDM.
|
|
|
|
|
|
-cp -f %{SOURCE130} po/ja.po
|
|
|
|
|
|
-%patch97 -p1 -b .bubble-location
|
|
|
-%patch98 -p1 -b .tray-padding
|
|
|
+%prep
|
|
|
+%setup -q
|
|
|
+%patch0 -p1 -b .fix-build
|
|
|
+%patch1 -p1 -b .disable-fatal-criticals
|
|
|
+%patch2 -p1 -b .welcome-pam
|
|
|
+%patch98 -p1 -b .plymouth
|
|
|
|
|
|
-%patch102 -p1 -b .force-vt7
|
|
|
%patch105 -p1 -b .xserver
|
|
|
-%patch108 -p1 -b .polkit
|
|
|
-%patch117 -p1 -b .use_timed_login_after_autologin
|
|
|
-%patch127 -p1 -b .slave_save_root_window
|
|
|
-%patch128 -p1 -b .plymouth
|
|
|
-%patch132 -p1 -b .hide-mouse-cursor
|
|
|
%patch134 -p1 -b .disable_a11y_default
|
|
|
-%patch138 -p1 -b .user_chooser_focus
|
|
|
|
|
|
%patch500 -p1 -b .vine-release
|
|
|
%patch501 -p1 -b .greeter-login-window-be-dock
|
|
|
-%patch502 -p1 -b .greeter-vine
|
|
|
%patch503 -p1 -b .disable-metacity-compositing_manager
|
|
|
%patch504 -p1 -b .simple-greeter-logo
|
|
|
-%patch505 -p1 -b .fix-login-dialog-focus
|
|
|
|
|
|
-cp -f %{SOURCE1} data/gdm
|
|
|
-cp -f %{SOURCE2} data/gdm-autologin
|
|
|
-
|
|
|
-%build
|
|
|
+cp -f %{SOURCE210} po/ja.po
|
|
|
|
|
|
autoreconf -i -f
|
|
|
-%configure --with-sysconfsubdir=X11/gdm \
|
|
|
- --with-dmconfdir=%{_sysconfdir}/X11/dm \
|
|
|
- --with-pam-prefix=%{_sysconfdir} \
|
|
|
- --with-working-directory=%{_localstatedir}/gdm \
|
|
|
- --enable-console-helper \
|
|
|
- --disable-scrollkeeper \
|
|
|
- --with-console-kit \
|
|
|
- --without-selinux
|
|
|
+
|
|
|
+# force regeneration
|
|
|
+rm data/dconf-override-db
|
|
|
+
|
|
|
+%build
|
|
|
+cp -f %{SOURCE1} data/gdm
|
|
|
+cp -f %{SOURCE2} data/gdm-autologin
|
|
|
+cp -f %{SOURCE3} data/gdm-welcome
|
|
|
+cp -f %{SOURCE4} gui/simple-greeter/extensions/password/gdm-password.pam
|
|
|
+cp -f %{SOURCE5} gui/simple-greeter/extensions/smartcard/gdm-smartcard.pam
|
|
|
+cp -f %{SOURCE6} gui/simple-greeter/extensions/fingerprint/gdm-fingerprint.pam
|
|
|
+cp -f %{SOURCE7} gui/simple-greeter/extensions/smartcard/icons/16x16/gdm-smartcard.png
|
|
|
+cp -f %{SOURCE8} gui/simple-greeter/extensions/smartcard/icons/48x48/gdm-smartcard.png
|
|
|
+cp -f %{SOURCE9} gui/simple-greeter/extensions/fingerprint/icons/16x16/gdm-fingerprint.png
|
|
|
+cp -f %{SOURCE10} gui/simple-greeter/extensions/fingerprint/icons/48x48/gdm-fingerprint.png
|
|
|
+
|
|
|
+%configure \
|
|
|
+ --with-pam-prefix=%{_sysconfdir} \
|
|
|
+ --with-working-directory=%{_localstatedir}/gdm \
|
|
|
+ --enable-console-helper \
|
|
|
+ --disable-scrollkeeper \
|
|
|
+ --with-console-kit \
|
|
|
+ --enable-split-authentication=yes \
|
|
|
+ --without-selinux
|
|
|
|
|
|
# drop unneeded direct library deps with --as-needed
|
|
|
# libtool doesn't make this easy, so we do it the hard way
|
|
|
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' \
|
|
|
- -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
|
|
|
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
|
|
|
+
|
|
|
+make -C po
|
|
|
|
|
|
-%__make -C po
|
|
|
+make %{?_smp_mflags}
|
|
|
|
|
|
-%__make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
|
@@ -187,20 +218,14 @@ mkdir -p $RPM_BUILD_ROOT/var/log/gdm
|
|
|
# and a spool dir
|
|
|
mkdir -p $RPM_BUILD_ROOT/var/spool/gdm
|
|
|
|
|
|
-# change default Init script for :0 to be Vine Linux default
|
|
|
-#ln -sf ../../xdm/Xsetup_0 $RPM_BUILD_ROOT/etc/X11/gdm/Init/:0
|
|
|
-
|
|
|
# remove the gdm Xsession as we're using the xdm one
|
|
|
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Xsession
|
|
|
-(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm; ln -sf ../xinit/Xsession .)
|
|
|
-
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
|
|
|
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Xsession
|
|
|
+(cd $RPM_BUILD_ROOT%{_sysconfdir}/gdm; ln -sf ../X11/xinit/Xsession .)
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow
|
|
|
|
|
|
# temporarily manually copy this
|
|
|
-cp -f %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
|
|
|
+cp -f %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/gdm/greeter
|
|
|
|
|
@@ -209,26 +234,18 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
|
|
|
find $RPM_BUILD_ROOT -name '*.a' -delete
|
|
|
find $RPM_BUILD_ROOT -name '*.la' -delete
|
|
|
|
|
|
-rm -f $RPM_BUILD_ROOT%{_includedir}/gdm/simple-greeter/gdm-greeter-extension.h
|
|
|
+rm -f $RPM_BUILD_ROOT%{_includedir}/gdm/simple-greeter/gdm-login-extension.h
|
|
|
rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdmsimplegreeter.pc
|
|
|
|
|
|
-%find_lang gdm --with-gnome
|
|
|
-
|
|
|
-# install Vine Theme
|
|
|
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/
|
|
|
-#tar xzvf %{SOURCE100} -C $RPM_BUILD_ROOT%{_datadir}/gdm/themes/
|
|
|
|
|
|
+install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir}/
|
|
|
# install gnome.desktop
|
|
|
# XXX: this should be included in each desktop environment package.
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
|
-cp %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
|
-
|
|
|
-install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir}/
|
|
|
+cp %{SOURCE203} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
|
|
|
|
-%find_lang gdm
|
|
|
|
|
|
-%clean
|
|
|
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
|
|
+%find_lang gdm --with-gnome
|
|
|
|
|
|
%pre
|
|
|
if [ "$1" -gt 1 ]; then
|
|
@@ -246,26 +263,22 @@ exit 0
|
|
|
|
|
|
%post
|
|
|
/sbin/ldconfig
|
|
|
-scrollkeeper-update >& /dev/null ||:
|
|
|
-
|
|
|
-touch --no-create %{_datadir}/icons/hicolor
|
|
|
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
|
- /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
|
|
|
-fi
|
|
|
|
|
|
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
|
|
|
|
|
|
+touch --no-create /usr/share/icons/hicolor >&/dev/null || :
|
|
|
+
|
|
|
# if the user already has a config file, then migrate it to the new
|
|
|
# location; rpm will ensure that old file will be renamed
|
|
|
|
|
|
-custom=/etc/X11/gdm/custom.conf
|
|
|
+custom=%{_sysconfdir}/gdm/custom.conf
|
|
|
|
|
|
if [ $1 -ge 2 ] ; then
|
|
|
if [ -f /usr/share/gdm/config/gdm.conf-custom ]; then
|
|
|
- oldconffile=/usr/share/gdm/config/gdm.conf-custom
|
|
|
+ oldconffile=/usr/share/gdm/config/gdm.conf-custom
|
|
|
elif [ -f /etc/X11/gdm/gdm.conf ]; then
|
|
|
- oldconffile=/etc/X11/gdm/gdm.conf
|
|
|
+ oldconffile=/etc/X11/gdm/gdm.conf
|
|
|
fi
|
|
|
|
|
|
# Comment out some entries from the custom config file that may
|
|
@@ -274,13 +287,14 @@ if [ $1 -ge 2 ] ; then
|
|
|
|
|
|
[ -n "$oldconffile" ] && sed \
|
|
|
-e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' \
|
|
|
- -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/bin/Xnest@' \
|
|
|
- -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xdm/Xsession@' \
|
|
|
+ -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' \
|
|
|
+ -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' \
|
|
|
+ -e 's@^BaseXsession=/etc/X11/gdm/Xsession@#&@' \
|
|
|
-e 's@^BaseXsession=/etc/gdm/Xsession@#&@' \
|
|
|
-e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' \
|
|
|
-e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' \
|
|
|
- -e 's@^GraphicalTheme=Vine@#&@' \
|
|
|
- -e 's@^BackgroundColor=#27408b@#&@' \
|
|
|
+ -e 's@^GraphicalTheme=Bluecurve@#&@' \
|
|
|
+ -e 's@^BackgroundColor=#20305a@#&@' \
|
|
|
-e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' \
|
|
|
-e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' \
|
|
|
-e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' \
|
|
@@ -298,8 +312,9 @@ if [ $1 -ge 2 ] ; then
|
|
|
$oldconffile > $custom
|
|
|
fi
|
|
|
|
|
|
-/usr/sbin/gdm-safe-restart >/dev/null 2>&1 || :
|
|
|
-exit 0
|
|
|
+if [ $1 -ge 2 -a -f $custom ] && grep -q /etc/X11/gdm $custom ; then
|
|
|
+ sed -i -e 's@/etc/X11/gdm@/etc/gdm@g' $custom
|
|
|
+fi
|
|
|
|
|
|
%preun
|
|
|
if [ "$1" -eq 0 ]; then
|
|
@@ -310,67 +325,125 @@ fi
|
|
|
%postun
|
|
|
/sbin/ldconfig
|
|
|
scrollkeeper-update >& /dev/null ||:
|
|
|
-touch --no-create %{_datadir}/icons/hicolor ||:
|
|
|
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
|
- /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
|
|
|
+if [ $1 -eq 0 ]; then
|
|
|
+ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
+ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
fi
|
|
|
|
|
|
+%posttrans
|
|
|
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
+
|
|
|
%files -f gdm.lang
|
|
|
%defattr(-, root, root)
|
|
|
-
|
|
|
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
|
|
|
-
|
|
|
-%dir %{_sysconfdir}/X11/gdm
|
|
|
-# Not sure which package %{_sysconfdir}/X11/dm dir should belong to,
|
|
|
-# this dir was agreed on among KDM and GDM maintainer to host
|
|
|
-# the new session setup
|
|
|
-%config %{_sysconfdir}/X11/dm/Sessions/*
|
|
|
-%config(noreplace) %{_sysconfdir}/X11/gdm/custom.conf
|
|
|
-%config %{_sysconfdir}/X11/gdm/Init/*
|
|
|
-%config %{_sysconfdir}/X11/gdm/PostLogin/*
|
|
|
-%config %{_sysconfdir}/X11/gdm/PreSession/*
|
|
|
-%config %{_sysconfdir}/X11/gdm/PostSession/*
|
|
|
+%doc AUTHORS COPYING NEWS README TODO
|
|
|
+%dir %{_sysconfdir}/gdm
|
|
|
+%config(noreplace) %{_sysconfdir}/gdm/custom.conf
|
|
|
+%config %{_sysconfdir}/gdm/Init/*
|
|
|
+%config %{_sysconfdir}/gdm/PostLogin/*
|
|
|
+%config %{_sysconfdir}/gdm/PreSession/*
|
|
|
+%config %{_sysconfdir}/gdm/PostSession/*
|
|
|
%config %{_sysconfdir}/pam.d/gdm
|
|
|
%config %{_sysconfdir}/pam.d/gdm-autologin
|
|
|
-%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
|
|
|
-%dir %{_sysconfdir}/X11/gdm/Init
|
|
|
-%dir %{_sysconfdir}/X11/gdm/PreSession
|
|
|
-%dir %{_sysconfdir}/X11/gdm/PostSession
|
|
|
-%dir %{_sysconfdir}/X11/gdm/PostLogin
|
|
|
-%{_sysconfdir}/gconf/schemas/*.schemas
|
|
|
-%{_sysconfdir}/X11/gdm/Xsession
|
|
|
+%config %{_sysconfdir}/pam.d/gdm-password
|
|
|
+%config %{_sysconfdir}/pam.d/gdm-welcome
|
|
|
+# not config files
|
|
|
+%{_sysconfdir}/gdm/Xsession
|
|
|
+%{_datadir}/gdm/gdm.schemas
|
|
|
+%{_sysconfdir}/X11/dm/Sessions/gnome.desktop
|
|
|
+%{_sysconfdir}/dbus-1/system.d/gdm.conf
|
|
|
+%dir %{_sysconfdir}/gdm/Init
|
|
|
+%dir %{_sysconfdir}/gdm/PreSession
|
|
|
+%dir %{_sysconfdir}/gdm/PostSession
|
|
|
+%dir %{_sysconfdir}/gdm/PostLogin
|
|
|
+%{_datadir}/gnome-session/sessions/gdm.session
|
|
|
%{_datadir}/pixmaps/*.png
|
|
|
-%dir %{_datadir}/pixmaps/faces
|
|
|
-%{_datadir}/pixmaps/faces/*.png
|
|
|
-%{_datadir}/pixmaps/faces/*.jpg
|
|
|
%{_datadir}/icons/hicolor/*/apps/*.png
|
|
|
+%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.fingerprint.gschema.xml
|
|
|
+%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.smartcard.gschema.xml
|
|
|
+%{_datadir}/gdm/simple-greeter/extensions/unified/page.ui
|
|
|
+%{_libexecdir}/gdm-factory-slave
|
|
|
+%{_libexecdir}/gdm-host-chooser
|
|
|
+%{_libexecdir}/gdm-product-slave
|
|
|
+%{_libexecdir}/gdm-session-worker
|
|
|
+%{_libexecdir}/gdm-simple-chooser
|
|
|
+%{_libexecdir}/gdm-simple-greeter
|
|
|
+%{_libexecdir}/gdm-simple-slave
|
|
|
+%{_libexecdir}/gdm-xdmcp-chooser-slave
|
|
|
+%{_sbindir}/gdm
|
|
|
+%{_sbindir}/gdm-binary
|
|
|
+%{_sbindir}/gdm-restart
|
|
|
+%{_sbindir}/gdm-safe-restart
|
|
|
+%{_sbindir}/gdm-stop
|
|
|
+%{_bindir}/gdmflexiserver
|
|
|
+%{_bindir}/gdm-screenshot
|
|
|
+%{_datadir}/gdm/*.ui
|
|
|
+%{_datadir}/gdm/locale.alias
|
|
|
+%{_sysconfdir}/gconf/schemas/*.schemas
|
|
|
+%{_datadir}/gdm/gdb-cmd
|
|
|
+%{_libexecdir}/gdm-crash-logger
|
|
|
+%{_libdir}/libgdm*.so*
|
|
|
+%dir %{_libdir}/gdm
|
|
|
+%dir %{_libdir}/gdm/simple-greeter
|
|
|
+%dir %{_libdir}/gdm/simple-greeter/extensions
|
|
|
+%{_libdir}/gdm/simple-greeter/extensions/libpassword.so
|
|
|
+%dir %{_datadir}/gdm/simple-greeter
|
|
|
+%dir %{_datadir}/gdm/simple-greeter/extensions
|
|
|
+%dir %{_datadir}/gdm/simple-greeter/extensions/password
|
|
|
+%{_datadir}/gdm/simple-greeter/extensions/password/page.ui
|
|
|
%dir %{_datadir}/gdm
|
|
|
-%{_datadir}/gdm/*
|
|
|
-%{_datadir}/gnome/help/gdm
|
|
|
-%{_datadir}/omf/gdm
|
|
|
-%{_datadir}/polkit-1/actions/gdm.policy
|
|
|
-%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
|
|
|
-%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
|
|
|
-%{_bindir}/*
|
|
|
-%{_libexecdir}/*
|
|
|
-%{_sbindir}/*
|
|
|
-%dir %{_var}/log/gdm
|
|
|
-%dir %{_var}/spool/gdm
|
|
|
-
|
|
|
+%dir %{_datadir}/gdm/autostart
|
|
|
+%dir %{_datadir}/gdm/autostart/LoginWindow
|
|
|
+%{_datadir}/gdm/autostart/LoginWindow/*
|
|
|
+%dir %{_localstatedir}/log/gdm
|
|
|
+%dir %{_localstatedir}/spool/gdm
|
|
|
%attr(1770, gdm, gdm) %dir %{_localstatedir}/gdm
|
|
|
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.gconf.mandatory/%gconf-tree.xml
|
|
|
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.gconf.path
|
|
|
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.local/share/applications/mime-dummy-handler.desktop
|
|
|
-%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.local/share/applications/mimeapps.list
|
|
|
-%attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
|
|
|
+%attr(1750, gdm, gdm) %dir %{_localstatedir}/gdm/.gconf.mandatory
|
|
|
+%attr(1640, gdm, gdm) %dir %{_localstatedir}/gdm/.gconf.mandatory/*.xml
|
|
|
+%attr(1640, gdm, gdm) %dir %{_localstatedir}/gdm/.gconf.path
|
|
|
%attr(1755, gdm, gdm) %dir %{_localstatedir}/run/gdm/greeter
|
|
|
+%attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
|
|
|
%attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
|
|
|
+%{_localstatedir}/gdm/.local/share/applications/mime-dummy-handler.desktop
|
|
|
+%{_localstatedir}/gdm/.local/share/applications/mimeapps.list
|
|
|
+%{_sysconfdir}/dconf/profile/gdm
|
|
|
+%{_sysconfdir}/dconf/db/gdm
|
|
|
+
|
|
|
+%files plugin-smartcard
|
|
|
+%defattr(-, root, root)
|
|
|
+%config %{_sysconfdir}/pam.d/gdm-smartcard
|
|
|
+%dir %{_datadir}/gdm/simple-greeter/extensions/smartcard
|
|
|
+%{_datadir}/gdm/simple-greeter/extensions/smartcard/page.ui
|
|
|
+%{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so
|
|
|
+%{_libexecdir}/gdm-smartcard-worker
|
|
|
+
|
|
|
+%files plugin-fingerprint
|
|
|
+%defattr(-, root, root)
|
|
|
+%config %{_sysconfdir}/pam.d/gdm-fingerprint
|
|
|
+%dir %{_datadir}/gdm/simple-greeter/extensions/fingerprint
|
|
|
+%{_datadir}/gdm/simple-greeter/extensions/fingerprint/page.ui
|
|
|
+%{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
|
|
|
|
|
|
%changelog
|
|
|
-* Mon Jul 11 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.2-6
|
|
|
-- add patch505 to fix login dialog focus problem
|
|
|
- - (re-)revert upstream change.
|
|
|
- http://git.gnome.org/browse/gdm/commit/?id=bc78b6c7fc40a6388ddb194461b7b5d140acd8d0
|
|
|
+* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
|
|
|
+- new upstream release
|
|
|
+- merge spec and patch files
|
|
|
+
|
|
|
+ * Wed Aug 3 2011 Lennart Poettering <lpoetter@redhat.com> - 1:3.1.2-4
|
|
|
+ - Register welcome pseudo-session in PAM
|
|
|
+ * Tue Jun 28 2011 Ray Strode <rstrode@redhat.com> 3.1.2-3
|
|
|
+ - Disable fatal critcals
|
|
|
+ Resolves: #717324
|
|
|
+ * Tue Jun 21 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 3.1.2-2
|
|
|
+ - Fix /dev/ull typo in scriptlets (#693046).
|
|
|
+ * Mon Jun 13 2011 Ray Strode <rstrode@redhat.com> 3.1.2-1
|
|
|
+ - Update for release
|
|
|
+ * Mon Jun 06 2011 Ray Strode <rstrode@redhat.com> 3.0.4-1
|
|
|
+ - Update to latest version
|
|
|
+ Resolves CVE-2011-1709
|
|
|
+ * Fri Apr 15 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-2
|
|
|
+ - Put the Fedora logo back in the greeter
|
|
|
+ * Mon Apr 4 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-1
|
|
|
+ - Update to 3.0.0
|
|
|
|
|
|
* Sat Jul 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.2-5
|
|
|
- add patch134 to disable a11y (revert upstream change)
|
|
@@ -1102,3 +1175,4 @@ fi
|
|
|
|
|
|
* Sat Feb 06 1999 Michael Johnson <johnsonm@redhat.com>
|
|
|
- initial packaging
|
|
|
+
|