|
@@ -3,7 +3,6 @@
|
|
%define gtk3_version 2.99.2
|
|
%define gtk3_version 2.99.2
|
|
%define libglade2_version 2.0.0
|
|
%define libglade2_version 2.0.0
|
|
%define libgnomeui_version 2.2.0
|
|
%define libgnomeui_version 2.2.0
|
|
-%define scrollkeeper_version 0.3.4
|
|
|
|
%define pam_version 0.99.8.1-11
|
|
%define pam_version 0.99.8.1-11
|
|
%define desktop_file_utils_version 0.2.90
|
|
%define desktop_file_utils_version 0.2.90
|
|
%define gail_version 1.2.0
|
|
%define gail_version 1.2.0
|
|
@@ -16,18 +15,16 @@
|
|
Summary: The GNOME Display Manager
|
|
Summary: The GNOME Display Manager
|
|
Summary(ja): GNOME ディスプレイマネージャ
|
|
Summary(ja): GNOME ディスプレイマネージャ
|
|
Name: gdm
|
|
Name: gdm
|
|
-Version: 3.8.1.1
|
|
+Version: 3.10.0.1
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
License: GPLv2+
|
|
License: GPLv2+
|
|
Group: User Interface/X
|
|
Group: User Interface/X
|
|
URL: http://download.gnome.org/sources/gdm
|
|
URL: http://download.gnome.org/sources/gdm
|
|
|
|
|
|
-Source: http://download.gnome.org/sources/gdm/3.8/gdm-%{version}.tar.xz
|
|
+Source: http://download.gnome.org/sources/gdm/3.10/gdm-%{version}.tar.xz
|
|
Source1: gdm-pam
|
|
Source1: gdm-pam
|
|
Source2: gdm-autologin-pam
|
|
Source2: gdm-autologin-pam
|
|
Source4: gdm-password.pam
|
|
Source4: gdm-password.pam
|
|
-Source5: gdm-smartcard.pam
|
|
|
|
-Source6: gdm-fingerprint.pam
|
|
|
|
Source11: polkit-gnome-authentication-agent-1.desktop
|
|
Source11: polkit-gnome-authentication-agent-1.desktop
|
|
|
|
|
|
Source200: gdm-restart
|
|
Source200: gdm-restart
|
|
@@ -56,7 +53,6 @@ Requires: libXau >= 1.0.4-4
|
|
Requires: audit-libs >= %{libauditver}
|
|
Requires: audit-libs >= %{libauditver}
|
|
|
|
|
|
BuildRequires: libcanberra-gtk3-devel
|
|
BuildRequires: libcanberra-gtk3-devel
|
|
-BuildRequires: scrollkeeper >= %{scrollkeeper_version}
|
|
|
|
BuildRequires: pango-devel >= %{pango_version}
|
|
BuildRequires: pango-devel >= %{pango_version}
|
|
BuildRequires: gtk3-devel >= %{gtk3_version}
|
|
BuildRequires: gtk3-devel >= %{gtk3_version}
|
|
BuildRequires: pam-devel >= %{pam_version}
|
|
BuildRequires: pam-devel >= %{pam_version}
|
|
@@ -90,7 +86,8 @@ BuildRequires: gnome-power-manager
|
|
BuildRequires: gsettings-desktop-schemas
|
|
BuildRequires: gsettings-desktop-schemas
|
|
BuildRequires: gnome-settings-daemon
|
|
BuildRequires: gnome-settings-daemon
|
|
|
|
|
|
-
|
|
+Obsoletes: %{name}-plugin-smartcard < 3.10.0
|
|
|
|
+Obsoletes: %{name}-plugin-fingerprint < 3.10.0
|
|
|
|
|
|
# Patch from Fedora
|
|
# Patch from Fedora
|
|
|
|
|
|
@@ -98,8 +95,7 @@ BuildRequires: gnome-settings-daemon
|
|
# Patch from Ubuntu
|
|
# Patch from Ubuntu
|
|
|
|
|
|
## patches for vine
|
|
## patches for vine
|
|
-Patch500: gdm-2.32.1-vine-release.patch
|
|
+Patch500: gdm-3.10.0-vine-release.patch
|
|
-Patch501: gdm-3.6.0-simple-slave-vine.patch
|
|
|
|
|
|
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
@@ -120,45 +116,23 @@ Requires: pkgconfig
|
|
Development files and headers for writing GDM greeters.
|
|
Development files and headers for writing GDM greeters.
|
|
|
|
|
|
|
|
|
|
-%package plugin-smartcard
|
|
|
|
-Summary: GDM smartcard plugin
|
|
|
|
-Group: User Interface/Desktops
|
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
|
-Requires: pam_pkcs11
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-%description plugin-smartcard
|
|
|
|
-The GDM smartcard plugin provides functionality necessary to use a smart card with GDM.
|
|
|
|
-
|
|
|
|
-%package plugin-fingerprint
|
|
|
|
-Summary: GDM fingerprint plugin
|
|
|
|
-Group: User Interface/Desktops
|
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
|
-Requires: fprintd-pam
|
|
|
|
-
|
|
|
|
-%description plugin-fingerprint
|
|
|
|
-The GDM fingerprint plugin provides functionality necessary to use a fingerprint reader with GDM.
|
|
|
|
-
|
|
|
|
-
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
%patch500 -p1 -b .vine-release
|
|
%patch500 -p1 -b .vine-release
|
|
-%patch501 -p1 -b .vine
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
cp -f %{SOURCE1} data/pam-redhat/gdm.pam
|
|
cp -f %{SOURCE1} data/pam-redhat/gdm.pam
|
|
cp -f %{SOURCE2} data/pam-redhat/gdm-autologin.pam
|
|
cp -f %{SOURCE2} data/pam-redhat/gdm-autologin.pam
|
|
cp -f %{SOURCE4} data/pam-redhat/gdm-password.pam
|
|
cp -f %{SOURCE4} data/pam-redhat/gdm-password.pam
|
|
-cp -f %{SOURCE5} data/pam-redhat/gdm-smartcard.pam
|
|
|
|
-cp -f %{SOURCE6} data/pam-redhat/gdm-fingerprint.pam
|
|
|
|
|
|
|
|
|
|
+autoreconf -if
|
|
|
|
+intltoolize --force --copy
|
|
%configure \
|
|
%configure \
|
|
--with-pam-prefix=%{_sysconfdir} \
|
|
--with-pam-prefix=%{_sysconfdir} \
|
|
--with-plymouth=yes \
|
|
--with-plymouth=yes \
|
|
--with-default-pam-config=redhat \
|
|
--with-default-pam-config=redhat \
|
|
--with-working-directory=%{_localstatedir}/gdm \
|
|
--with-working-directory=%{_localstatedir}/gdm \
|
|
--enable-console-helper \
|
|
--enable-console-helper \
|
|
- --disable-scrollkeeper \
|
|
|
|
--with-console-kit \
|
|
--with-console-kit \
|
|
--enable-split-authentication=yes \
|
|
--enable-split-authentication=yes \
|
|
--without-selinux \
|
|
--without-selinux \
|
|
@@ -214,6 +188,9 @@ install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
cp %{SOURCE203} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
cp %{SOURCE203} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
|
|
|
|
|
|
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gdm-fingerprint
|
|
|
|
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gdm-smartcard
|
|
|
|
+
|
|
|
|
|
|
%find_lang gdm --with-gnome
|
|
%find_lang gdm --with-gnome
|
|
|
|
|
|
@@ -317,13 +294,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
%dir %{_sysconfdir}/gdm/PostLogin
|
|
%dir %{_sysconfdir}/gdm/PostLogin
|
|
%{_datadir}/pixmaps/*.png
|
|
%{_datadir}/pixmaps/*.png
|
|
%{_datadir}/icons/hicolor/*/apps/*.png
|
|
%{_datadir}/icons/hicolor/*/apps/*.png
|
|
-%{_datadir}/gdm/simple-greeter/extensions/unified/page.ui
|
|
|
|
-#%{_libexecdir}/gdm-factory-slave
|
|
|
|
%{_libexecdir}/gdm-host-chooser
|
|
%{_libexecdir}/gdm-host-chooser
|
|
-#%{_libexecdir}/gdm-product-slave
|
|
|
|
%{_libexecdir}/gdm-session-worker
|
|
%{_libexecdir}/gdm-session-worker
|
|
%{_libexecdir}/gdm-simple-chooser
|
|
%{_libexecdir}/gdm-simple-chooser
|
|
-%{_libexecdir}/gdm-simple-greeter
|
|
|
|
%{_libexecdir}/gdm-simple-slave
|
|
%{_libexecdir}/gdm-simple-slave
|
|
%{_libexecdir}/gdm-xdmcp-chooser-slave
|
|
%{_libexecdir}/gdm-xdmcp-chooser-slave
|
|
%{_sbindir}/gdm
|
|
%{_sbindir}/gdm
|
|
@@ -332,19 +305,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
%{_sbindir}/gdm-stop
|
|
%{_sbindir}/gdm-stop
|
|
%{_bindir}/gdmflexiserver
|
|
%{_bindir}/gdmflexiserver
|
|
%{_bindir}/gdm-screenshot
|
|
%{_bindir}/gdm-screenshot
|
|
-%{_datadir}/gdm/*.ui
|
|
|
|
%{_datadir}/gdm/locale.alias
|
|
%{_datadir}/gdm/locale.alias
|
|
%{_datadir}/gdm/gdb-cmd
|
|
%{_datadir}/gdm/gdb-cmd
|
|
%{_libdir}/libgdm*.so*
|
|
%{_libdir}/libgdm*.so*
|
|
-%dir %{_libdir}/gdm
|
|
|
|
-%dir %{_libdir}/gdm/simple-greeter
|
|
|
|
-%dir %{_libdir}/gdm/simple-greeter/extensions
|
|
|
|
-%{_libdir}/gdm/simple-greeter/extensions/libpassword.so
|
|
|
|
%{_libdir}/girepository-1.0/*.typelib
|
|
%{_libdir}/girepository-1.0/*.typelib
|
|
-%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
|
|
%dir %{_datadir}/gdm
|
|
%dir %{_datadir}/gdm/autostart
|
|
%dir %{_datadir}/gdm/autostart
|
|
%dir %{_datadir}/gdm/autostart/LoginWindow
|
|
%dir %{_datadir}/gdm/autostart/LoginWindow
|
|
@@ -352,7 +316,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
%{_datadir}/gdm/greeter/autostart/orca-autostart.desktop
|
|
%{_datadir}/gdm/greeter/autostart/orca-autostart.desktop
|
|
%{_datadir}/gdm/greeter/applications/*
|
|
%{_datadir}/gdm/greeter/applications/*
|
|
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
|
|
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
|
|
-%{_datadir}/gnome-session/sessions/gdm-fallback.session
|
|
|
|
%{_datadir}/gnome-session/sessions/gdm-shell.session
|
|
%{_datadir}/gnome-session/sessions/gdm-shell.session
|
|
%dir %{_localstatedir}/log/gdm
|
|
%dir %{_localstatedir}/log/gdm
|
|
%dir %{_localstatedir}/spool/gdm
|
|
%dir %{_localstatedir}/spool/gdm
|
|
@@ -370,26 +333,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
%{_includedir}/gdm/gdm-client.h
|
|
%{_includedir}/gdm/gdm-client.h
|
|
%{_includedir}/gdm/gdm-sessions.h
|
|
%{_includedir}/gdm/gdm-sessions.h
|
|
%{_includedir}/gdm/gdm-user-switching.h
|
|
%{_includedir}/gdm/gdm-user-switching.h
|
|
-%{_includedir}/gdm/simple-greeter/gdm-login-extension.h
|
|
|
|
%{_datadir}/gir-1.0/*.gir
|
|
%{_datadir}/gir-1.0/*.gir
|
|
%{_libdir}/pkgconfig/*.pc
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
|
|
|
-%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
|
|
%changelog
|
|
|
|
+* Sat Oct 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.10.0.1-1
|
|
|
|
+- new upstream release
|
|
|
|
+- update Patch500 (gdm-3.10.0-vine-release.patch)
|
|
|
|
+- remove Patch501 (gdm-3.6.0-simple-slave-vine.patch)
|
|
|
|
+- remove plugin-smartcard and plugin-fingerprint subpackages
|
|
|
|
+
|
|
* Mon Apr 22 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.8.1.1-1
|
|
* Mon Apr 22 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.8.1.1-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- add Requires: gnome-shell
|
|
- add Requires: gnome-shell
|