gdm:

- update to 2.30.2
- add polkit/gdmsetup patch from ubuntu
- drop themes


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1031 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gdm/gdm-vl.spec

@@ -13,8 +13,8 @@
 Summary: The GNOME Display Manager.
 Summary(ja): GNOME ディスプレイマネージャ
 Name: gdm
-Version: 2.20.10
-Release: 6%{?_dist_release}
+Version: 2.30.2
+Release: 1%{?_dist_release}
 License: LGPL/GPL
 Group: User Interface/X
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/
@@ -22,29 +22,43 @@ URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/
 Source: %{name}-%{version}.tar.bz2
 Source1: gdm-pam
 Source2: gdm-autologin-pam
-Source3: gdmsetup-pam
-Source4: 90-grant-audio-devices-to-gdm.fdi
-Source10: gdm-theme-vine-5.2.tar.bz2
-Source12: gnome.desktop
-Source13: system-hibernate.png
-Source14: gdm-2.20.10-ja.po
+#Source3: gdm-password.pam
+#Source4: gdm-smartcard.pam
+#Source5: gdm-fingerprint.pam
+#Source6: gdm-smartcard-16.png
+#Source7: gdm-smartcard-48.png
+#Source8: gdm-fingerprint-16.png
+#Source9: gdm-fingerprint-48.png
+Source10: polkit-gnome-authentication-agent-1.desktop
+
+#Source100: gdm-theme-vine-5.2.tar.bz2
+Source110: gnome.desktop
+Source120: system-hibernate.png
+Source130: gdm-2.30.2-ja.po
+
+## patches from fedora
+Patch2: plymouth.patch
+#Patch96: gdm-multistack.patch
+# Fedora-specific
+Patch97: gdm-bubble-location.patch
+Patch98: tray-padding.patch
 
 ## patches from ubuntu
-Patch11: gdm-2.20.10-powermanagement.patch
-Patch18: gdm-2.20.10-combobox-language-selector.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
 
 ## patches for vine
-Patch100: gdm-2.20.10-vine.patch
-Patch101: gdm-2.20.8-gdmsetup-usermode.patch
-Patch110: gdm-2.18.1-vine-locale.patch
+#Patch500: gdm-2.20.10-vine.patch
+#Patch501: gdm-2.20.8-gdmsetup-usermode.patch
+#Patch510: gdm-2.18.1-vine-locale.patch
 
 # security fix
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-Prereq: shadow-utils
-Prereq: scrollkeeper >= %{scrollkeeper_version}
+Requires(pre): shadow-utils
 Requires: pam >= %{pam_version}
 Requires: hal >= %{hal_version}
 Requires: ConsoleKit >= %{consolekit_version}
@@ -53,6 +67,12 @@ Requires: xinitrc
 Requires: xorg-x11-xdm
 Requires: util-linux
 Requires: vine-backgrounds >= 4.0
+Requires: gnome-settings-daemon
+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}
@@ -66,6 +86,7 @@ BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: libtool, automake, autoconf
 BuildRequires: ConsoleKit
 BuildRequires: libdmx-devel, audit-libs-devel
+BuildRequires: libcanberra-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -80,86 +101,101 @@ several different X sessions on your local machine at the same time.
 %prep
 %setup -q
 
-cp -f %{SOURCE1} config/gdm
-cp -f %{SOURCE2} config/gdm-autologin
-cp -f %{SOURCE3} utils/gdmsetup-pam
+cp -f %{SOURCE130} po/ja.po
 
-cp -f %{SOURCE14} po/ja.po
+%patch2 -p1 -b .plymouth
+#%patch96 -p1 -b .multistack
+%patch97 -p1 -b .bubble-location
+%patch98 -p1 -b .tray-padding
+%patch101 -p1 -b .check-active-vt
+%patch102 -p1 -b .polkit
+%patch103 -p1 -b .gdmsetup
 
-%patch11 -p1 -b .powermanagement
-%patch18 -p1 -b .combobox-language-selector
+autoreconf -i -f
 
-%patch100 -p1 -b .vine
-%patch101 -p1 -b .gdmsetup-usermode
-%patch110 -p1 -b .vine-lcoale
+cp -f %{SOURCE1} data/gdm
+cp -f %{SOURCE2} data/gdm-autologin
+#cp -f %{SOURCE3} gui/simple-greeter/plugins/password/gdm-password.pam
+#cp -f %{SOURCE4} gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam
+#cp -f %{SOURCE5} gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam
+#cp -f %{SOURCE6} gui/simple-greeter/plugins/smartcard/icons/16x16/gdm-smartcard.png
+#cp -f %{SOURCE7} gui/simple-greeter/plugins/smartcard/icons/48x48/gdm-smartcard.png
+#cp -f %{SOURCE8} gui/simple-greeter/plugins/fingerprint/icons/16x16/gdm-fingerprint.png
+#cp -f %{SOURCE9} gui/simple-greeter/plugins/fingerprint/icons/48x48/gdm-fingerprint.png
 
-cp -f %{SOURCE13} pixmaps/24x24/
+#cp -f %{SOURCE120} pixmaps/24x24/
 
 %build
-intltoolize --force --copy
-aclocal
-libtoolize --force --copy
-automake --add-missing
-autoconf
-autoheader
-%configure --sysconfdir=%{_sysconfdir}/X11 \
+%configure --with-sysconfsubdir=X11/gdm \
+	   --with-dmconfdir=%{_sysconfdir}/X11/dm \
            --with-pam-prefix=%{_sysconfdir} \
-	   --enable-console-helper --disable-scrollkeeper \
-	   --with-console-kit
-%__make
+	   --enable-console-helper \
+	   --disable-scrollkeeper \
+	   --with-console-kit \
+	   --without-selinux
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' \
+       -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+%__make -C po
+
+%__make %{?_smp_mflags}
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Init
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PreSession
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostSession
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # docs go elsewhere
-rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
-
-# change default Init script for :0 to be Vine Linux default
-ln -sf ../../xdm/Xsetup_0 $RPM_BUILD_ROOT/etc/X11/gdm/Init/:0
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/doc
 
 # create log dir
-mkdir -p $RPM_BUILD_ROOT%{_var}/log/gdm
+mkdir -p $RPM_BUILD_ROOT/var/log/gdm
+
+# and a spool dir
+mkdir -p $RPM_BUILD_ROOT/var/spool/gdm
+
+# change default Init script for :0 to be Vine Linux default
+#ln -sf ../../xdm/Xsetup_0 $RPM_BUILD_ROOT/etc/X11/gdm/Init/:0
 
 # remove the gdm Xsession as we're using the xdm one
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Xsession
+(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm; ln -sf ../xinit/Xsession .)
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
 
-## remove the other gnome session file, since we put it in gnome-session
-rm -rf $RPM_BUILD_ROOT%{_datadir}/xsessions
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow
 
-# use consolehelper for gdmsetup
-ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/gdmsetup
+# temporarily manually copy this
+cp -f %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
 
-# fix the "login photo" file
-desktop-file-install --vendor "" --delete-original          \
-  --dir $RPM_BUILD_ROOT%{_datadir}/gdm/applications         \
-  --remove-key NetShowIn				    \
-  --add-category X-GNOME-PersonalSettings                   \
-  $RPM_BUILD_ROOT%{_datadir}/gdm/applications/gdmphotosetup.desktop
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/gdm/greeter
 
-# broken install-data-local in gui/Makefile.am makes this necessary
-(cd $RPM_BUILD_ROOT%{_bindir} && ln -sf gdmXnestchooser gdmXnest)
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
-# grant access to alsa and oss devices for the gdm user
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-cp %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+find $RPM_BUILD_ROOT -name '*.a' -delete
+find $RPM_BUILD_ROOT -name '*.la' -delete
 
-# use ja_JP.eucJP for Japanese Locale.
-#perl -pi -e 's/ja_JP.UTF-8/ja_JP.eucJP/g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/locale.alias
+rm -f $RPM_BUILD_ROOT%{_includedir}/gdm/simple-greeter/gdm-greeter-extension.h
+rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdmsimplegreeter.pc
+
+%find_lang gdm --with-gnome
 
 # install Vine Theme
-tar xzvf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/gdm/themes/
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/
+#tar xzvf %{SOURCE100} -C $RPM_BUILD_ROOT%{_datadir}/gdm/themes/
 
-# install WindowMaker.desktop, gnome.desktop
+# install gnome.desktop
 # XXX: this should be included in each desktop environment package.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
-cp %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
-
-rm -rf $RPM_BUILD_ROOT%{_var}/lib/scrollkeeper
+cp %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 %find_lang gdm
 
@@ -167,6 +203,13 @@ rm -rf $RPM_BUILD_ROOT%{_var}/lib/scrollkeeper
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %pre
+if [ "$1" -gt 1 ]; then
+  if [ -f %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas ];
+  then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
+  fi
+fi
 /usr/sbin/useradd -M -u 42 -d %{_localstatedir}/gdm -s /sbin/nologin -r gdm > /dev/null 2>&1
 /usr/sbin/usermod -d %{_localstatedir}/gdm -s /sbin/nologin gdm >/dev/null 2>&1
 # ignore errors, as we can't disambiguate between gdm already existed
@@ -182,6 +225,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
+
 # if the user already has a config file, then migrate it to the new
 # location; rpm will ensure that old file will be renamed
 
@@ -229,10 +275,16 @@ fi
 
 exit 0
 
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas >/dev/null
+fi
+
 %postun
 /sbin/ldconfig
 scrollkeeper-update >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
+touch --no-create %{_datadir}/icons/hicolor ||:
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
@@ -242,45 +294,65 @@ fi
 
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 
-%dir /etc/X11/gdm
-# Not sure which package /etc/X11/dm dir should belong to,
+%dir %{_sysconfdir}/X11/gdm
+# Not sure which package %{_sysconfdir}/X11/dm dir should belong to,
 # this dir was agreed on among KDM and GDM maintainer to host
 # the new session setup
-%config /etc/X11/dm/Sessions/*
-%config(noreplace) /etc/X11/gdm/custom.conf
-%config /etc/X11/gdm/XKeepsCrashing
-%config /etc/X11/gdm/locale.alias
-%config /etc/X11/gdm/Init/*
-%config /etc/X11/gdm/PostLogin/*
-%config /etc/X11/gdm/PreSession/*
-%config /etc/X11/gdm/PostSession/*
-%config /etc/X11/gdm/modules/*
-%config /etc/pam.d/gdm
-%config /etc/pam.d/gdmsetup
-%config /etc/pam.d/gdm-autologin
-%config /etc/security/console.apps/gdmsetup
-%dir /etc/X11/gdm/Init
-%dir /etc/X11/gdm/PreSession
-%dir /etc/X11/gdm/PostSession
-%dir /etc/X11/gdm/PostLogin
-%dir /etc/X11/gdm/modules
-%{_datadir}/pixmaps
-%{_datadir}/icons
-%{_datadir}/gdm
-#%{_datadir}/applications
+%config %{_sysconfdir}/X11/dm/Sessions/*
+%config(noreplace) %{_sysconfdir}/X11/gdm/custom.conf
+%config %{_sysconfdir}/X11/gdm/Init/*
+%config %{_sysconfdir}/X11/gdm/PostLogin/*
+%config %{_sysconfdir}/X11/gdm/PreSession/*
+%config %{_sysconfdir}/X11/gdm/PostSession/*
+%config %{_sysconfdir}/pam.d/gdm
+%config %{_sysconfdir}/pam.d/gdm-autologin
+#%config %{_sysconfdir}/pam.d/gdm-password
+#%config %{_sysconfdir}/pam.d/gdm-fingerprint
+#%config %{_sysconfdir}/pam.d/gdm-smartcard
+%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
+%dir %{_sysconfdir}/X11/gdm/Init
+%dir %{_sysconfdir}/X11/gdm/PreSession
+%dir %{_sysconfdir}/X11/gdm/PostSession
+%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
+%{_datadir}/pixmaps/faces/*.jpg
+%{_datadir}/icons/hicolor/*/apps/*.png
+%dir %{_datadir}/gdm
+%{_datadir}/gdm/*
+%{_datadir}/applications/gdmsetup.desktop
 %{_datadir}/gnome/help/gdm
 %{_datadir}/omf/gdm
-%{_datadir}/hal/fdi/policy/20thirdparty/90-grant-audio-devices-to-gdm.fdi
-%{_libdir}/gtk-2.0/modules/*.so
+%{_datadir}/polkit-1/actions/gdm.policy
+%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
+#%{_libdir}/gdm/simple-greeter/plugins/*.so
+#%{_libdir}/*.so*
 %{_bindir}/*
 %{_libexecdir}/*
-%{_mandir}/man*/*
 %{_sbindir}/*
 %dir %{_var}/log/gdm
+%dir %{_var}/spool/gdm
+%dir %{_var}/run/gdm/greeter
 
+%attr(1770, gdm, gdm) %dir %{_localstatedir}/lib/gdm
+%attr(1770, gdm, gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml
+%attr(1770, gdm, gdm) %{_localstatedir}/lib/gdm/.gconf.path
+%attr(1755, gdm, gdm) %dir %{_localstatedir}/run/gdm/greeter
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
+%attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
+%attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
 
 %changelog
+* Mon May 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.30.0-1
+- new upstream release
+- add patch101,102,103 from ubuntu
+- drop themes
+
 * Sat Jul 25 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 2.20.10-6
 - update Patch100: fix typo & change BackgroundColor/GraphicalThemedColor
   <BTS:VineLinux:0732>