|
@@ -11,18 +11,18 @@
|
|
|
%define consolekit_version 0.3.0-9
|
|
|
%define fontconfig_version 2.6.0
|
|
|
|
|
|
-%define _default_patch_fuzz 999
|
|
|
+## %define _default_patch_fuzz 999
|
|
|
|
|
|
Summary: The GNOME Display Manager
|
|
|
Summary(ja): GNOME ディスプレイマネージャ
|
|
|
Name: gdm
|
|
|
-Version: 3.1.2
|
|
|
+Version: 3.2.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPLv2+
|
|
|
Group: User Interface/X
|
|
|
URL: http://download.gnome.org/sources/gdm
|
|
|
|
|
|
-Source: http://download.gnome.org/sources/gdm/2.91/gdm-%{version}.tar.xz
|
|
|
+Source: http://download.gnome.org/sources/gdm/3.2/gdm-%{version}.tar.xz
|
|
|
Source1: gdm-pam
|
|
|
Source2: gdm-autologin-pam
|
|
|
Source3: gdm-welcome-pam
|
|
@@ -84,6 +84,7 @@ BuildRequires: iso-codes
|
|
|
BuildRequires: libxklavier-devel >= 4.0
|
|
|
BuildRequires: upower-devel >= 0.9.7
|
|
|
BuildRequires: libXdmcp-devel
|
|
|
+BuildRequires: libSM-devel
|
|
|
BuildRequires: dbus-glib-devel
|
|
|
BuildRequires: GConf2-devel
|
|
|
BuildRequires: accountsservice-devel
|
|
@@ -96,12 +97,10 @@ BuildRequires: gsettings-desktop-schemas
|
|
|
BuildRequires: gnome-settings-daemon
|
|
|
|
|
|
|
|
|
+Patch0: gdm-3.1.92-plymouth.patch
|
|
|
+
|
|
|
# Patch from Fedora
|
|
|
-Patch0: fix-build.patch
|
|
|
-Patch1: disable-fatal-criticals.patch
|
|
|
-Patch2: 0001-welcome-register-in-PAM-in-addition-to-ConsoleKit.patch
|
|
|
|
|
|
-Patch98: plymouth.patch
|
|
|
|
|
|
# Patch from Ubuntu
|
|
|
Patch105: 05_initial_server_on_vt7.patch
|
|
@@ -128,10 +127,21 @@ Distribution: Vine Linux
|
|
|
GDM provides the graphical login screen, shown shortly after boot up,
|
|
|
log out, and when user-switching.
|
|
|
|
|
|
+
|
|
|
+%package devel
|
|
|
+Summary: Development files and headers for GDM
|
|
|
+Group: Development/Libraries
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
+Requires: pkgconfig
|
|
|
+
|
|
|
+%description devel
|
|
|
+Development files and headers for writing GDM greeters.
|
|
|
+
|
|
|
+
|
|
|
%package plugin-smartcard
|
|
|
Summary: GDM smartcard plugin
|
|
|
Group: User Interface/Desktops
|
|
|
-Requires: gdm = %{version}-%{release}
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
Requires: pam_pkcs11
|
|
|
|
|
|
|
|
@@ -141,7 +151,7 @@ The GDM smartcard plugin provides functionality necessary to use a smart card wi
|
|
|
%package plugin-fingerprint
|
|
|
Summary: GDM fingerprint plugin
|
|
|
Group: User Interface/Desktops
|
|
|
-Requires: gdm = %{version}-%{release}
|
|
|
+Requires: %{name} = %{version}-%{release}
|
|
|
Requires: fprintd-pam
|
|
|
|
|
|
%description plugin-fingerprint
|
|
@@ -150,10 +160,7 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch0 -p1 -b .fix-build
|
|
|
-%patch1 -p1 -b .disable-fatal-criticals
|
|
|
-%patch2 -p1 -b .welcome-pam
|
|
|
-%patch98 -p1 -b .plymouth
|
|
|
+%patch0 -p1 -b .plymouth
|
|
|
|
|
|
%patch105 -p1 -b .xserver
|
|
|
%patch134 -p1 -b .disable_a11y_default
|
|
@@ -234,9 +241,6 @@ 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-login-extension.h
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdmsimplegreeter.pc
|
|
|
-
|
|
|
|
|
|
install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir}/
|
|
|
# install gnome.desktop
|
|
@@ -329,9 +333,13 @@ if [ $1 -eq 0 ]; then
|
|
|
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
fi
|
|
|
+if [ $1 -eq 0 ]; then
|
|
|
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
+fi
|
|
|
|
|
|
%posttrans
|
|
|
gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
|
|
|
%files -f gdm.lang
|
|
|
%defattr(-, root, root)
|
|
@@ -355,11 +363,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%dir %{_sysconfdir}/gdm/PreSession
|
|
|
%dir %{_sysconfdir}/gdm/PostSession
|
|
|
%dir %{_sysconfdir}/gdm/PostLogin
|
|
|
-%{_datadir}/gnome-session/sessions/gdm.session
|
|
|
+#%{_datadir}/gnome-session/sessions/gdm.session
|
|
|
%{_datadir}/pixmaps/*.png
|
|
|
%{_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
|
|
@@ -386,6 +392,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%dir %{_libdir}/gdm/simple-greeter
|
|
|
%dir %{_libdir}/gdm/simple-greeter/extensions
|
|
|
%{_libdir}/gdm/simple-greeter/extensions/libpassword.so
|
|
|
+%{_libdir}/girepository-1.0/*.typelib
|
|
|
%dir %{_datadir}/gdm/simple-greeter
|
|
|
%dir %{_datadir}/gdm/simple-greeter/extensions
|
|
|
%dir %{_datadir}/gdm/simple-greeter/extensions/password
|
|
@@ -394,6 +401,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%dir %{_datadir}/gdm/autostart
|
|
|
%dir %{_datadir}/gdm/autostart/LoginWindow
|
|
|
%{_datadir}/gdm/autostart/LoginWindow/*
|
|
|
+%{_datadir}/gdm/greeter/applications/*
|
|
|
+%{_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
|
|
|
%dir %{_localstatedir}/log/gdm
|
|
|
%dir %{_localstatedir}/spool/gdm
|
|
|
%attr(1770, gdm, gdm) %dir %{_localstatedir}/gdm
|
|
@@ -403,11 +414,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%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 devel
|
|
|
+%defattr(-, root, root)
|
|
|
+%{_includedir}/gdm/greeter/gdm-greeter-client.h
|
|
|
+%{_includedir}/gdm/greeter/gdm-greeter-sessions.h
|
|
|
+%{_includedir}/gdm/simple-greeter/gdm-login-extension.h
|
|
|
+%{_datadir}/gir-1.0/*.gir
|
|
|
+%{_libdir}/pkgconfig/*.pc
|
|
|
+
|
|
|
%files plugin-smartcard
|
|
|
%defattr(-, root, root)
|
|
|
%config %{_sysconfdir}/pam.d/gdm-smartcard
|
|
@@ -424,6 +441,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Oct 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.0-1
|
|
|
+- new upstream release
|
|
|
+- create %%{name}-devel sub package
|
|
|
+- add BuildRequires: libSM-devel
|
|
|
+
|
|
|
* Wed Aug 17 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
|
|
|
- new upstream release
|
|
|
- merge spec and patch files
|