|
|
@@ -13,8 +13,8 @@
|
|
|
Summary: The GNOME Display Manager.
|
|
|
Summary(ja): GNOME ディスプレイマネージャ
|
|
|
Name: gdm
|
|
|
-Version: 2.30.2
|
|
|
-Release: 6%{?_dist_release}
|
|
|
+Version: 2.32.0
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: LGPL/GPL
|
|
|
Group: User Interface/X
|
|
|
URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/
|
|
|
@@ -32,26 +32,23 @@ Source201: gdm-safe-restart
|
|
|
Source202: gdm-stop
|
|
|
|
|
|
## patches from fedora
|
|
|
-Patch2: plymouth.patch
|
|
|
+#Patch2: gdm-2.32-plymouth.patch
|
|
|
#Patch96: gdm-multistack.patch
|
|
|
# Fedora-specific
|
|
|
Patch97: gdm-bubble-location.patch
|
|
|
Patch98: tray-padding.patch
|
|
|
|
|
|
## patches from ubuntu
|
|
|
-Patch100: 01_upower.patch
|
|
|
-Patch101: gdm-2.30.0-check-active-vt.patch
|
|
|
-Patch102: gdm-2.30.2-use-polkit-for-settings.patch
|
|
|
-Patch103: gdm-2.30.0-gdmsetup.patch
|
|
|
-Patch104: gdm-2.30.0-hide-mouse-cursor.patch
|
|
|
-Patch105: 02_x_server_location.patch
|
|
|
+Patch102: 02_x_server_location.patch
|
|
|
+Patch105: 05_initial_server_on_vt7.patch
|
|
|
+Patch108: 08_use_polkit_for_settings.patch
|
|
|
+Patch109: 09_gdmsetup.patch
|
|
|
+Patch127: 27_save_root_window.patch
|
|
|
+Patch128: 28_plymouth_transition.patch
|
|
|
+Patch132: 32-hide-mouse-cursor.patch
|
|
|
|
|
|
## patches for vine
|
|
|
-Patch500: gdm-2.30.2-vine-release.patch
|
|
|
-Patch501: gdm-2.30.2_add_dbus_glib_to_applet_deps.patch
|
|
|
-#Patch500: gdm-2.20.10-vine.patch
|
|
|
-#Patch501: gdm-2.20.8-gdmsetup-usermode.patch
|
|
|
-#Patch510: gdm-2.18.1-vine-locale.patch
|
|
|
+Patch500: gdm-2.32.0-vine-release.patch
|
|
|
|
|
|
# security fix
|
|
|
|
|
|
@@ -72,7 +69,6 @@ Requires: polkit-gnome
|
|
|
Requires: iso-codes
|
|
|
Requires: gnome-session
|
|
|
Requires: gnome-keyring-pam
|
|
|
-Requires: plymouth-gdm-hooks
|
|
|
BuildRequires: scrollkeeper >= %{scrollkeeper_version}
|
|
|
BuildRequires: pango-devel >= %{pango_version}
|
|
|
BuildRequires: gtk2-devel >= %{gtk2_version}
|
|
|
@@ -111,19 +107,20 @@ several different X sessions on your local machine at the same time.
|
|
|
|
|
|
cp -f %{SOURCE130} po/ja.po
|
|
|
|
|
|
-%patch2 -p1 -b .plymouth
|
|
|
+#%patch2 -p1 -b .plymouth
|
|
|
#%patch96 -p1 -b .multistack
|
|
|
%patch97 -p1 -b .bubble-location
|
|
|
%patch98 -p1 -b .tray-padding
|
|
|
-%patch100 -p1 -b .upower
|
|
|
-%patch101 -p1 -b .check-active-vt
|
|
|
-%patch102 -p1 -b .polkit
|
|
|
-%patch103 -p1 -b .gdmsetup
|
|
|
-%patch104 -p1 -b .hide-mouse-cursor
|
|
|
+
|
|
|
+%patch102 -p1 -b .force-vt7
|
|
|
%patch105 -p1 -b .xserver
|
|
|
+%patch108 -p1 -b .polkit
|
|
|
+%patch109 -p1 -b .gdmsetup
|
|
|
+%patch127 -p1 -b .slave_save_root_window
|
|
|
+%patch128 -p1 -b .plymouth
|
|
|
+%patch132 -p1 -b .hide-mouse-cursor
|
|
|
|
|
|
%patch500 -p1 -b .vine-release
|
|
|
-%patch501 -p1 -b .dbus-glib
|
|
|
|
|
|
autoreconf -i -f
|
|
|
|
|
|
@@ -319,7 +316,6 @@ fi
|
|
|
%dir %{_sysconfdir}/X11/gdm/PostLogin
|
|
|
%{_sysconfdir}/gconf/schemas/*.schemas
|
|
|
%{_sysconfdir}/X11/gdm/Xsession
|
|
|
-%{_sysconfdir}/X11/gdm/gdm.schemas
|
|
|
%{_datadir}/pixmaps/*.png
|
|
|
%dir %{_datadir}/pixmaps/faces
|
|
|
%{_datadir}/pixmaps/faces/*.png
|
|
|
@@ -348,6 +344,12 @@ fi
|
|
|
%attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Mar 08 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.0-1
|
|
|
+- update to 2.32.0
|
|
|
+- remove R: plymouth-gdm-hooks
|
|
|
+- use ubuntu plymouth integration patch instead of fedora's.
|
|
|
+- update ubuntu patches
|
|
|
+
|
|
|
* Sat Jan 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.2-6
|
|
|
- remove Patch1 (gdm-2.30.2-UTF-8.patch)
|
|
|
|
daisuke