SPECS (AC-branch): gnome-session.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 16:43:45 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gnome-session.spec (1.101 -> 1.101.4.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-session.spec
diff -u SPECS/gnome-session.spec:1.101 SPECS/gnome-session.spec:1.101.4.1
--- SPECS/gnome-session.spec:1.101	Wed Oct  5 20:22:42 2005
+++ SPECS/gnome-session.spec	Mon May 15 18:43:40 2006
@@ -6,39 +6,37 @@
 Summary:	The GNOME desktop programs for the GNOME2 GUI desktop environment
 Summary(pl):	Programy dla desktopu środowiska graficznego GNOME2
 Name:		gnome-session
-Version:	2.12.0
-Release:	2
+Version:	2.14.1
+Release:	1
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	835e9340d23e139430224b931ff4c597
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	0b7a0fa918f7d0565d6487d06fa4489d
 Source1:	%{name}-gnome.desktop
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-less_verbose.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.12.0
+BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	esound-devel >= 1:0.2.30
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-keyring >= 0.4.2
+BuildRequires:	gnome-keyring-devel >= 0.4.2
 BuildRequires:	gtk+2-devel >= 2:2.8.3
 BuildRequires:	intltool
-BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
 BuildRequires:	pango-devel >= 1:1.10.0
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	xft-devel >= 2.1
-Requires(post):	/sbin/ldconfig
 Requires(post,preun):	GConf2
-Requires:	control-center >= 1:2.12.0
+Requires:	control-center >= 1:2.14.0
 Requires:	gnome-keyring >= 0.4.2
 Requires:	gnome-splash
 Requires:	gnome-wm
-Requires:	libgnomeui >= 2.12.0
+Requires:	libgnomeui >= 2.14.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -92,6 +90,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -123,6 +122,7 @@
 %doc AUTHORS *ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/gnome-session.schemas
+%dir %{_datadir}/gnome/autostart
 %{_datadir}/gnome/default.session
 %{_datadir}/gnome/default.wm
 %{_datadir}/xsessions/*.desktop
@@ -140,6 +140,39 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101.4.1  2006/05/15 16:43:40  baggins
+- merged from HEAD
+
+Revision 1.103  2006/04/10 17:12:50  freetz
+- 2.14.1
+
+Revision 1.102  2006/04/02 14:29:11  freetz
+- merged from DEVEL
+
+Revision 1.101.2.8  2006/03/18 12:01:02  wiget
+- fix gnome-keyring BR
+
+Revision 1.101.2.7  2006/03/13 21:29:20  freetz
+- 2.14.0
+
+Revision 1.101.2.6  2006/03/04 13:23:32  freetz
+- md5
+
+Revision 1.101.2.5  2006/02/28 15:46:43  freetz
+- 2.13.92, one more time fixed autostart dir
+
+Revision 1.101.2.4  2006/02/16 08:22:07  freetz
+- fix the autostart dir location to match the spec
+
+Revision 1.101.2.3  2006/02/13 20:42:05  freetz
+- 2.13.91
+
+Revision 1.101.2.2  2006/01/31 15:27:28  freetz
+- add autostart folder
+
+Revision 1.101.2.1  2006/01/30 23:09:40  freetz
+- 2.13.90
+
 Revision 1.101  2005/10/05 18:22:42  freetz
 - rel.2 for rebuild
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-session.spec?r1=1.101&r2=1.101.4.1&f=u