SPECS: gnome-session.spec - merged from DEVEL

patrys patrys at pld-linux.org
Wed Mar 18 12:34:28 CET 2009 

Author: patrys                       Date: Wed Mar 18 11:34:28 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-session.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: SPECS/gnome-session.spec
diff -u SPECS/gnome-session.spec:1.147 SPECS/gnome-session.spec:1.148
--- SPECS/gnome-session.spec:1.147	Sat Feb 14 18:15:25 2009
+++ SPECS/gnome-session.spec	Wed Mar 18 12:34:22 2009
@@ -1,54 +1,44 @@
 # $Revision$, $Date$
-#
-# NOTE:
-#	- DO NOT upgrade this spec to new version until
-#	http://bugzilla.gnome.org/show_bug.cgi?id=552387 gets fixed
-#	(and I mean FIXED, not CLOSED)
-#
 Summary:	The GNOME desktop programs for the GNOME2 GUI desktop environment
 Summary(pl.UTF-8):	Programy dla desktopu środowiska graficznego GNOME2
 Name:		gnome-session
-Version:	2.22.3
-Release:	4
+Version:	2.26.0
 Epoch:		1
+Release:	1
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5:	859b61b5368aa000c9bcb8b0d0688ca2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5:	e17dbce7446b3e42fac2b1cea7dedffd
 Source1:	%{name}-gnome.desktop
-Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-configure.patch
-Patch2:		%{name}-no_G_DEBUG.patch
+Patch0:		%{name}-splash.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552387
+Patch1:		%{name}-saving.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	GConf2-devel >= 2.26.0
+BuildRequires:	PolicyKit-gnome-devel >= 0.7
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-settings-daemon-devel >= 1:2.22.0
-BuildRequires:	esound-devel >= 1:0.2.36
-BuildRequires:	glib2-devel >= 1:2.16.3
-BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-keyring-devel >= 2.22.0
-BuildRequires:	gtk+2-devel >= 2:2.12.9
-BuildRequires:	intltool >= 0.36.1
-BuildRequires:	libgnomeui-devel >= 2.22.1
-BuildRequires:	libnotify-devel >= 0.2.1
-BuildRequires:	libselinux-devel >= 1.34
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gtk+2-devel >= 2:2.16.0
+BuildRequires:	intltool >= 0.40.0
+BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	sed >= 4.0
+BuildRequires:	startup-notification-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-xtrans-devel
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,preun):	GConf2
-Requires:	gnome-control-center >= 1:2.22.0
-Requires:	gnome-keyring >= 2.22.0
+Requires:	PolicyKit-gnome >= 0.7
+Requires:	gnome-control-center >= 1:2.26.0
 Requires:	gnome-splash
 Requires:	gnome-wm
-Requires:	libgnomeui >= 2.22.1
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,8 +78,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+cd gnome-session
+%patch1 -p0
+cd ..
 
 sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
 mv po/sr@{Latn,latin}.po
@@ -106,9 +97,7 @@
 	--disable-schemas-install \
 	X_EXTRA_LIBS="-lXext"
 
-%{__make} \
-	ESD_SERVER='%{_bindir}/esd' \
-	GNOME_KEYRING_DAEMON='%{_bindir}/gnome-keyring-daemon' \
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -149,8 +138,17 @@
 %attr(755,root,root) %{_bindir}/gnome-session-remove
 %attr(755,root,root) %{_bindir}/gnome-session-save
 %attr(755,root,root) %{_bindir}/gnome-wm
+%dir %{_libexecdir}/gnome-session
+%dir %{_libexecdir}/gnome-session/helpers
+%attr(755,root,root) %{_libexecdir}/gnome-session/helpers/at-spi-registryd-wrapper
+%attr(755,root,root) %{_libexecdir}/gnome-session/helpers/gnome-session-splash
+%attr(755,root,root) %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper
 %{_sysconfdir}/gconf/schemas/gnome-session.schemas
+%{_sysconfdir}/xdg/autostart/at-spi-registryd-wrapper.desktop
+%{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop
 %dir %{_datadir}/gnome/autostart
+%{_datadir}/gnome/autostart/gnome-session-splash.desktop
+%dir %{_datadir}/gnome/default-session
 %dir %{_datadir}/gnome/shutdown
 %{_datadir}/gnome/default.session
 %{_datadir}/xsessions/gnome.desktop
@@ -169,10 +167,32 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2009/03/18 11:34:22  patrys
+- merged from DEVEL
+
+Revision 1.142.2.1.2.4  2009/03/18 11:30:29  patrys
+- add session saving patch
+
+Revision 1.142.2.1.2.3  2009/03/17 17:38:31  megabajt
+- updated to 2.26.0
+- session saving not yet ready in this release
+
+Revision 1.142.2.1.2.2  2009/03/04 18:28:28  megabajt
+- updated to 2.25.92
+- session saving is back, but there might be bugs
+
+Revision 1.142.2.1.2.1  2009/02/21 11:34:58  megabajt
+- updated to 2.25.91
+- removed obsolete -configure.patch
+
 Revision 1.147  2009/02/14 17:15:25  megabajt
 - provides /usr/share/gnome/shutdown directory (as gnome-session 2.24.x)
 - fixed location of at-spi-registryd (since GNOME 2.24 in %{_libdir})
 - release 4
+
+Revision 1.142.2.1  2009/01/28 20:59:26  patrys
+- 2.24.3
+- match Epoch with HEAD
 
 Revision 1.146  2009/01/20 12:32:32  arekm
 - rel 3; fix epoch deps
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-session.spec?r1=1.147&r2=1.148&f=u

More information about the pld-cvs-commit mailing list