rpms/gdm/F-13 gdm.spec,1.510,1.511 sources,1.120,1.121

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gdm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27692

Modified Files:
	gdm.spec sources 
Log Message:
2.30.0



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-13/gdm.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- gdm.spec	26 Mar 2010 00:40:54 -0000	1.510
+++ gdm.spec	30 Mar 2010 00:07:55 -0000	1.511
@@ -14,14 +14,14 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 2.29.92
-Release: 6%{?dist}
+Version: 2.30.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
 #VCS: git:git://git.gnome.org/gdm
-Source: http://download.gnome.org/sources/gdm/2.29/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.30/gdm-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdm-password.pam
@@ -55,8 +55,6 @@ Requires: plymouth-gdm-hooks
 Requires: pulseaudio-gdm-hooks
 # We need 1.0.4-5 since it lets us use "localhost" in auth cookies
 Requires: libXau >= 1.0.4-4
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
 BuildRequires: pkgconfig(libcanberra-gtk)
 BuildRequires: scrollkeeper >= 0:%{scrollkeeper_version}
 BuildRequires: pango-devel >= 0:%{pango_version}
@@ -93,14 +91,12 @@ Provides: service(graphical-login) = %{n
 Requires: audit-libs >= %{libauditver}
 Patch2: plymouth.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=610179
-Patch3: accounts-service.patch
-
 Patch96: gdm-multistack.patch
 # Fedora-specific
 Patch97: gdm-bubble-location.patch
 Patch98: tray-padding.patch
 Patch99: gdm-2.23.1-fedora-logo.patch
+Patch100: fix-boot.patch
 
 Patch101: gdm-libs.patch
 
@@ -140,11 +136,11 @@ The GDM fingerprint plugin provides func
 %prep
 %setup -q
 %patch2 -p1 -b .plymouth
-%patch3 -p1 -b .accounts-service
 %patch96 -p1 -b .multistack
 %patch97 -p1 -b .bubble-location
 %patch98 -p1 -b .tray-padding
 %patch99 -p1 -b .fedora-logo
+%patch100 -p1 -b .fix-boot
 %patch101 -p1 -b .libs
 
 autoreconf -i -f
@@ -161,11 +157,11 @@ cp -f %{SOURCE8} gui/simple-greeter/plug
 cp -f %{SOURCE9} gui/simple-greeter/plugins/fingerprint/icons/48x48/gdm-fingerprint.png
 
 %configure --with-pam-prefix=%{_sysconfdir} \
-	   --enable-profiling      \
-	   --enable-console-helper \
-	   --disable-scrollkeeper  \
-	   --with-console-kit      \
-	   --with-selinux
+           --enable-profiling      \
+           --enable-console-helper \
+           --disable-scrollkeeper  \
+           --with-console-kit      \
+           --with-selinux
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -245,12 +241,8 @@ exit 0
 
 %post
 /sbin/ldconfig
-scrollkeeper-update
 
-touch --no-create /usr/share/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q /usr/share/icons/hicolor
-fi
+touch --no-create /usr/share/icons/hicolor >&/dev/null || :
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
@@ -262,9 +254,9 @@ custom=/etc/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
@@ -312,12 +304,14 @@ fi
 
 %postun
 /sbin/ldconfig
-scrollkeeper-update
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || :
+
 %files -f gdm.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING NEWS README TODO
@@ -402,11 +396,8 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
-* Thu Mar 25 2010 Ray Strode <rstrode at redhat.com> 2.29.92-6
-- Fix up plymouth patch
-
-* Wed Mar 24 2010 Ray Strode <rstrode at redhat.com> 2.29.92-5
-- Add accounts service patch
+* Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-1
+- Update to 2.30.0
 
 * Wed Mar 24 2010 Matthias Clasen <mclasen at redhat.com> 2.29.92-4
 - Drop hal dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-13/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- sources	9 Mar 2010 14:48:05 -0000	1.120
+++ sources	30 Mar 2010 00:07:56 -0000	1.121
@@ -1 +1 @@
-a82bbab661b66767870a65e53cb52630  gdm-2.29.92.tar.bz2
+0da84637abbcbf1666529d6192a81e6b  gdm-2.30.0.tar.bz2