SPECS: gdm.spec - epoch 2, release 2: reverted to -r1.227 (before merge fro...

Mon Oct 13 11:29:32 CEST 2008

Author: radek                        Date: Mon Oct 13 09:29:32 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- epoch 2, release 2: reverted to -r1.227 (before merge from DEVEL),
  tagged previous version as DEVEL.  This is not ready for merge.

---- Files affected:
SPECS:
   gdm.spec (1.229 -> 1.230) 

---- Diffs:

================================================================
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.229 SPECS/gdm.spec:1.230

--- SPECS/gdm.spec:1.229	Sun Oct 12 20:50:20 2008
+++ SPECS/gdm.spec	Mon Oct 13 11:29:27 2008
@@ -15,19 +15,24 @@
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	2.24.0
+Version:	2.20.7
 Release:	2
-Epoch:		1
+Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5:	c38e3debe8a02ad385f1c7077d21de9e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5:	15be72743003cb1e36c9ce2ac2de5381
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
-#Source4:	%{name}-autologin.pamd
+# http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-artwork/gdm/storky/
+Source4:	%{name}-storky.tar.gz
+# Source4-md5:	e293fbe4a60004056f6894463b874ae8
+Source5:	%{name}-autologin.pamd
 Patch0:		%{name}-xdmcp.patch
+Patch1:		%{name}-conf.patch
 Patch2:		%{name}-xsession.patch
+Patch3:		%{name}-desktop.patch
 Patch4:		%{name}-defaults.patch
 URL:		http://www.gnome.org/projects/gdm/
 BuildRequires:	ConsoleKit-devel
@@ -36,7 +41,6 @@
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.73
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.15.0
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	intltool >= 0.36.1
 BuildRequires:	libart_lgpl-devel >= 2.3.19
@@ -65,8 +69,6 @@
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	gnome-session >= 2.23.90
-Requires:	gnome-settings-daemon >= 2.23.90
 Requires:	libgnomeui >= 2.20.0
 Requires:	pam >= 0.99.7.1
 Requires:	which
@@ -80,6 +82,8 @@
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_localstatedir	/var/lib
+
 %description
 Gdm (the GNOME Display Manager) is a highly configurable
 reimplementation of xdm, the X Display Manager. Gdm allows you to log
@@ -143,17 +147,21 @@
 Skrypt init dla GDM-a.
 
 %prep
-%setup -q 
+%setup -q -a4
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
+
 %build
 %{__libtoolize}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__aclocal}
-%{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
@@ -165,9 +173,7 @@
 	--with-tcp-wrappers=yes \
 	--with%{!?with_selinux:out}-selinux \
 	--with-xdmcp=yes \
-	--with-xinerama=yes \
-	--with-user=xdm \
-	--with-group=xdm
+	--with-xinerama=yes
 
 %{__make}
 
@@ -175,17 +181,23 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
 	$RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
+	$RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	PAM_PREFIX=/etc
 
+mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop \
+	$RPM_BUILD_ROOT%{_datadir}/xsessions
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
-#install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
+
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 %find_lang %{name} --with-gnome --with-omf --all-name
@@ -204,15 +216,9 @@
 %useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
 
 %post
-%gconf_schema_install gdm-simple-greeter.schemas
-#%%gconf_schema_install gdm-user-switch-applet.schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall gdm-simple-greeter.schemas
-#%%gconf_schema_uninstall gdm-user-switch-applet.schemas
-
 %postun
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
@@ -245,45 +251,49 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_libexecdir}/gdm-crash-logger
-%attr(755,root,root) %{_libexecdir}/gdm-factory-slave
-%attr(755,root,root) %{_libexecdir}/gdm-host-chooser
-%attr(755,root,root) %{_libexecdir}/gdm-product-slave
-%attr(755,root,root) %{_libexecdir}/gdm-session-worker
-%attr(755,root,root) %{_libexecdir}/gdm-simple-chooser
-%attr(755,root,root) %{_libexecdir}/gdm-simple-greeter
-%attr(755,root,root) %{_libexecdir}/gdm-simple-slave
-%attr(755,root,root) %{_libexecdir}/gdm-user-switch-applet
-%attr(755,root,root) %{_libexecdir}/gdm-xdmcp-chooser-slave
+%attr(755,root,root) %{_bindir}/gdm-dmx-reconnect-proxy
+%attr(755,root,root) %{_bindir}/gdmdynamic
+%attr(755,root,root) %{_bindir}/gdmflexiserver
+%attr(755,root,root) %{_bindir}/gdmphotosetup
+%attr(755,root,root) %{_bindir}/gdmthemetester
+%attr(755,root,root) %{_libdir}/gdmaskpass
+%attr(755,root,root) %{_libdir}/gdmopen
+%attr(755,root,root) %{_libdir}/gdmtranslate
+%attr(755,root,root) %{_libdir}/gdmchooser
+%attr(755,root,root) %{_libdir}/gdmgreeter
+%attr(755,root,root) %{_libdir}/gdmlogin
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/gdm
-%dir %{_sysconfdir}/gdm/Init
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
+%dir %{_sysconfdir}/gdm/modules
+%attr(755,root,root) %config %{_sysconfdir}/gdm/Init
 %attr(755,root,root) %config %{_sysconfdir}/gdm/PreSession
 %attr(755,root,root) %config %{_sysconfdir}/gdm/PostSession
+%attr(755,root,root) %config %{_sysconfdir}/gdm/XKeepsCrashing
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
-%dir %{_sysconfdir}/gdm/PostLogin
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
-%{_sysconfdir}/gdm/gdm.schemas
-%{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
-#%{_sysconfdir}/gconf/schemas/gdm-user-switch-applet.schemas
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/*
+%config %{_sysconfdir}/gdm/locale.alias
+%config %{_sysconfdir}/gdm/modules/*
+
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/
+
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gdm*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.gdm
-%attr(750,xdm,xdm) %{_localstatedir}/gdm
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
+%attr(750,xdm,xdm) /var/lib/gdm
+%attr(750,xdm,xdm) /var/log/gdm
 %attr(750,xdm,xdm) /home/services/xdm
 %{_pixmapsdir}/*
 %{_datadir}/gdm
+#%%{_datadir}/xsessions  -  moved to gnome-session
+%{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
-%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
-%{_libdir}/bonobo/servers/*.server
-%{_localstatedir}/lib/gdm
+%{_iconsdir}/hicolor/*/apps/*.svg
+%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
+%{_mandir}/man1/gdm*
 
 %files Xnest
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gdmXnest
+%attr(755,root,root) %{_bindir}/gdmXnestchooser
 
 %files init
 %defattr(644,root,root,755)
@@ -295,6 +305,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.230  2008/10/13 09:29:27  radek
+- epoch 2, release 2: reverted to -r1.227 (before merge from DEVEL),
+  tagged previous version as DEVEL.  This is not ready for merge.
+
 Revision 1.229  2008/10/12 18:50:20  patrys
 - rebuild with proper init script
 - rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gdm.spec?r1=1.229&r2=1.230&f=u

