Browse Source

gdm: fix metacity warning, update ja.po, update gdmsetup

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2979 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
fad8bb7c56
1 changed files with 14 additions and 3 deletions
  1. 14 3
      g/gdm/gdm-vl.spec

+ 14 - 3
g/gdm/gdm-vl.spec

@@ -14,7 +14,7 @@ Summary: The GNOME Display Manager.
 Summary(ja): GNOME ディスプレイマネージャ
 Name: gdm
 Version: 2.32.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: LGPL/GPL
 Group: User Interface/X
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/
@@ -25,7 +25,7 @@ Source2: gdm-autologin-pam
 Source10: polkit-gnome-authentication-agent-1.desktop
 
 Source110: gnome.desktop
-Source130: gdm-2.30.2-ja.po
+Source130: gdm-2.32.0-ja.po
 
 Source200: gdm-restart
 Source201: gdm-safe-restart
@@ -42,7 +42,8 @@ Patch98: tray-padding.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
+#Patch109: 09_gdmsetup.patch
+Patch109: gdm-2.32.0-gdmsetup.patch
 Patch127: 27_save_root_window.patch
 Patch128: 28_plymouth_transition.patch
 Patch132: 32-hide-mouse-cursor.patch
@@ -50,6 +51,10 @@ Patch132: 32-hide-mouse-cursor.patch
 ## patches for vine
 Patch500: gdm-2.32.0-vine-release.patch
 
+## fix metacity warning
+## http://git.gnome.org/browse/gdm/commit/?h=gnome-2-28&id=98a1649b17320957b9a2521af07d15ba51c187c9
+Patch501: gdm-2.32.0-greeter-login-window-be-dock.patch
+
 # security fix
 
 
@@ -122,6 +127,8 @@ cp -f %{SOURCE130} po/ja.po
 
 %patch500 -p1 -b .vine-release
 
+%patch501 -p1 -b .greeter-login-window-be-dock
+
 autoreconf -i -f
 
 cp -f %{SOURCE1} data/gdm
@@ -344,6 +351,10 @@ fi
 %attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
 
 %changelog
+* Wed Mar 09 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.0-2
+- add Patch501 to fix metacity warning..
+- update ja.po
+
 * Tue Mar 08 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.32.0-1
 - update to 2.32.0
 - remove R: plymouth-gdm-hooks