cvsdist 0a9215c
%define glib2_version 2.2.0
cvsdist 0a9215c
%define pango_version 1.2.0
cvsdist 0a9215c
%define gtk2_version 2.2.0
cvsdist a128fa5
%define libgnome_version 2.3.0
cvsdist a128fa5
%define libgnomeui_version 2.3.0
cvsdist a128fa5
%define libbonobo_version 2.3.0
cvsdist a128fa5
%define libbonoboui_version 2.3.0
cvsdist a128fa5
%define gnome_vfs2_version 2.3.0
cvsdist 0a9215c
%define gconf2_version 2.2.0
cvsdist 3899e20
cvsdist 3899e20
%define po_package gnome-session-2.0
cvsdist 38cb97f
cvsdist 38cb97f
Summary: GNOME session manager
cvsdist 38cb97f
Name: gnome-session
5380c08
Version: 2.8.0
5380c08
Release: 1
cvsdist 38cb97f
URL: http://www.gnome.org
cvsdist b82449e
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.7/%{name}-%{version}.tar.bz2
cvsdist e6040b6
Source1: Gnome.session
cvsdist 3899e20
Source2: redhat-default-session
cvsdist a128fa5
Source3: gnome.desktop
cvsdist 38cb97f
License: GPL 
cvsdist 38cb97f
Group: User Interface/Desktops
cvsdist 38cb97f
BuildRoot: %{_tmppath}/%{name}-root
cvsdist 38cb97f
cvsdist 8222cdf
# For intltool:
cvsdist 8222cdf
BuildRequires: perl-XML-Parser >= 2.31-16
cvsdist 8222cdf
cvsdist 3899e20
Requires: redhat-artwork >= 0.20
cvsdist 3899e20
Requires: /usr/share/pixmaps/splash/gnome-splash.png
cvsdist 3899e20
# required to get gconf-sanity-check-2 in the right place
cvsdist 3899e20
Requires: GConf2 >= %{gconf2_version}
cvsdist a128fa5
# Needed for gnome-settings-daemon
cvsdist a128fa5
Requires: control-center
cvsdist 3899e20
cvsdist e6040b6
## we conflict with gdm that contains the GNOME gdm session
cvsdist a128fa5
Conflicts: gdm < 1:2.4.0.7-7
cvsdist a128fa5
cvsdist a128fa5
Patch1: gnome-session-2.2.2-icons.patch
cvsdist a128fa5
Patch2: gnome-session-2.0.5-login.patch
cvsdist a128fa5
Patch3: gnome-session-2.0.5-dithering.patch
cvsdist 0a9215c
## http://bugzilla.gnome.org/show_bug.cgi?id=106450
cvsdist a128fa5
Patch4: gnome-session-2.2.0.2-splash-repaint.patch
cvsdist b82449e
Patch5: gnome-session-2.7.4-read-desktop-entries.patch
cvsdist 38cb97f
cvsdist 38cb97f
BuildRequires: glib2-devel >= %{glib2_version}
cvsdist 3899e20
BuildRequires: pango-devel >= %{pango_version}
cvsdist 38cb97f
BuildRequires: gtk2-devel >= %{gtk2_version}
cvsdist 38cb97f
BuildRequires: libgnome-devel >= %{libgnome_version}
cvsdist 38cb97f
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
cvsdist 38cb97f
BuildRequires: libbonobo-devel >= %{libbonobo_version}
cvsdist 38cb97f
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
cvsdist 38cb97f
BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
cvsdist 38cb97f
cvsdist 38cb97f
# this is so the configure checks find /usr/bin/halt etc.
cvsdist 38cb97f
BuildRequires: usermode
cvsdist 38cb97f
cvsdist 8ca03ca
BuildRequires: automake14 autoconf gettext
cvsdist 8ca03ca
cvsdist 38cb97f
%description
cvsdist 38cb97f
cvsdist 38cb97f
gnome-session manages a GNOME desktop session. It starts up the other core 
cvsdist 38cb97f
GNOME components and handles logout and saving the session.
cvsdist 38cb97f
cvsdist 38cb97f
%prep
cvsdist 38cb97f
%setup -q
cvsdist 38cb97f
cvsdist 0a9215c
%patch1 -p1 -b .icons
cvsdist a128fa5
%patch2 -p1 -b .login
cvsdist a128fa5
%patch3 -p1 -b .dithering
cvsdist a128fa5
%patch4 -p1 -b .splash-repaint
cvsdist b82449e
%patch5 -p1 -b .read-desktop-entries
cvsdist 38cb97f
cvsdist 38cb97f
%build
cvsdist 8222cdf
cvsdist 8222cdf
#workaround broken perl-XML-Parser on 64bit arches
cvsdist 8222cdf
export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
cvsdist 8222cdf
cvsdist a128fa5
automake-1.4
cvsdist a128fa5
autoheader
cvsdist a128fa5
autoconf
cvsdist 38cb97f
cvsdist 3899e20
%configure --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot
cvsdist 38cb97f
make
cvsdist 38cb97f
cvsdist 38cb97f
%install
cvsdist 38cb97f
rm -rf $RPM_BUILD_ROOT
cvsdist 38cb97f
cvsdist 3899e20
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
cvsdist 38cb97f
%makeinstall
cvsdist 3899e20
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
cvsdist 38cb97f
5380c08
desktop-file-install --vendor gnome --delete-original                   \
cvsdist 277752c
  --dir $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets          \
cvsdist 277752c
  --add-only-show-in GNOME                                              \
cvsdist 277752c
  --add-category X-Red-Hat-Base                                         \
5380c08
  --remove-category Settings                                            \
cvsdist 277752c
  $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/*
cvsdist 277752c
cvsdist e6040b6
./mkinstalldirs $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/
cvsdist e6040b6
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/GNOME
cvsdist e6040b6
cvsdist a128fa5
./mkinstalldirs $RPM_BUILD_ROOT/etc/X11/dm/Sessions/
cvsdist a128fa5
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/dm/Sessions/
cvsdist a128fa5
cvsdist 3899e20
/bin/rm $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
cvsdist 3899e20
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
cvsdist 3899e20
cvsdist a128fa5
#/bin/rm -r $RPM_BUILD_ROOT/var/scrollkeeper
cvsdist 3899e20
cvsdist 3899e20
## remove splash screen
cvsdist 3899e20
rm -r $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash
cvsdist 3899e20
cvsdist 3899e20
%find_lang %{po_package}
cvsdist 38cb97f
cvsdist 38cb97f
%clean
cvsdist 38cb97f
rm -rf $RPM_BUILD_ROOT
cvsdist 38cb97f
cvsdist 38cb97f
%post
cvsdist 38cb97f
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
cvsdist 38cb97f
SCHEMAS="gnome-session.schemas"
cvsdist 38cb97f
for S in $SCHEMAS; do
cvsdist 38cb97f
  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
cvsdist 38cb97f
done
cvsdist 38cb97f
/sbin/ldconfig
cvsdist 38cb97f
cvsdist 3899e20
%files -f %{po_package}.lang
cvsdist 38cb97f
%defattr(-,root,root)
cvsdist 38cb97f
cvsdist 38cb97f
%doc AUTHORS COPYING ChangeLog NEWS README
cvsdist 38cb97f
cvsdist 38cb97f
%{_datadir}/gnome
cvsdist 38cb97f
%{_datadir}/control-center-2.0
cvsdist 38cb97f
%{_datadir}/man/man*/*
cvsdist 38cb97f
%{_bindir}/*
cvsdist 38cb97f
%{_sysconfdir}/gconf/schemas/*.schemas
cvsdist e6040b6
%{_sysconfdir}/X11/gdm
cvsdist a128fa5
%{_sysconfdir}/X11/dm/Sessions/*
cvsdist 38cb97f
cvsdist 38cb97f
%changelog
5380c08
* Fri Sep 17 2004 Ray Strode <rstrode@redhat.com> 2.8.0-1
5380c08
- Update to 2.8.0 
5380c08
- Remove "Session" item from Preferences menu
5380c08
cvsdist 571bd93
* Fri Sep 03 2004 Ray Strode <rstrode@redhat.com> 2.7.91-2
cvsdist 571bd93
- Fix from Federico for infamous hanging splash screen problem.
cvsdist 571bd93
  (http://bugzilla.gnome.org/show_bug.cgi?id=151664)
cvsdist 571bd93
cvsdist b82449e
* Tue Aug 31 2004 Ray Strode <rstrode@redhat.com> 2.7.91-1
cvsdist b82449e
- Update to 2.7.91
cvsdist b82449e
cvsdist b7da87e
* Wed Aug 18 2004 Ray Strode <rstrode@redhat.com> 2.7.4-3
cvsdist b7da87e
- Change folder name from "autostart" to more aptly named
cvsdist b7da87e
  "session-upgrades" from suggestion by Colin Walters.
cvsdist b7da87e
- put non-upstream gconf key in rh_extensions
cvsdist b7da87e
cvsdist b7da87e
* Wed Aug 18 2004 Ray Strode <rstrode@redhat.com> 2.7.4-2
cvsdist 241ee56
- Provide drop-a-desktop-file method of adding programs
cvsdist 241ee56
  to the user's session.
cvsdist 241ee56
cvsdist 0036b66
* Fri Jul 30 2004 Ray Strode <rstrode@redhat.com> 2.7.4-1
cvsdist 0036b66
- Update to 2.7.4
cvsdist 0036b66
cvsdist bf0823f
* Wed Jul 14 2004 root <markmc@localhost.localdomain> - 2.6.0-7
cvsdist bf0823f
- Add patch to activate vino based on the "remote_access/enabled"
cvsdist bf0823f
  preference
cvsdist bf0823f
cvsdist 2f222ff
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
cvsdist 2f222ff
- rebuilt
cvsdist 2f222ff
cvsdist ce581c7
* Mon Jun 14 2004 Ray Strode <rstrode@redhat.com> 2.6.0-5
cvsdist ce581c7
- Prevent having duplicate packages in different collections
cvsdist ce581c7
cvsdist 277752c
* Mon Jun 14 2004 Ray Strode <rstrode@redhat.com> 2.6.0-4
cvsdist 277752c
- Use desktop-file-install instead of patching 
cvsdist 277752c
  session-properties.desktop.  Add X-Red-Hat-Base category.
cvsdist 277752c
cvsdist 277752c
* Thu Jun 10 2004 Ray Strode <rstrode@redhat.com> 2.6.0-3
cvsdist 8ca03ca
- Add terminating list delimiter to OnlyShowIn entry of 
cvsdist 8ca03ca
  session-properties.desktop
cvsdist 8ca03ca
cvsdist 8ca03ca
* Fri Apr 16 2004 Warren Togami <wtogami@redhat.com> 2.6.0-2
cvsdist 8ca03ca
- #110725 BR automake14 autoconf gettext
cvsdist 8ca03ca
cvsdist bf0d4fd
* Wed Mar 31 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-1
cvsdist bf0d4fd
- Update to 2.6.0
cvsdist bf0d4fd
cvsdist d95ac45
* Wed Mar 10 2004 Mark McLoughlin <markmc@redhat.com>
cvsdist d95ac45
- Update to 2.5.91
cvsdist d95ac45
cvsdist d95ac45
* Tue Feb 24 2004 Mark McLoughlin <markmc@redhat.com> 2.5.90-1
cvsdist d95ac45
- Update to 2.5.90
cvsdist d95ac45
- Remove extraneous fontconfig BuildRequires
cvsdist d95ac45
- Resolve conflicts with the icons and splash-repaint patches
cvsdist d95ac45
cvsdist d95ac45
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
cvsdist d95ac45
- rebuilt
cvsdist d95ac45
cvsdist 8222cdf
* Mon Jan 26 2004 Alexander Larsson <alexl@redhat.com> 2.5.3-1
cvsdist 8222cdf
- Update to 2.5.3
cvsdist 443b430
cvsdist 443b430
* Wed Nov 05 2003 Than Ngo <than@redhat.com> 2.4.0-2
cvsdist 443b430
- don't show gnome-session-properties in KDE (bug #102533)
cvsdist 443b430
cvsdist a128fa5
* Fri Aug 29 2003 Alexander Larsson <alexl@redhat.com> 2.3.7-3
cvsdist a128fa5
- fix up gnome.desktop location
cvsdist a128fa5
cvsdist a128fa5
* Fri Aug 29 2003 Alexander Larsson <alexl@redhat.com> 2.3.7-2
cvsdist a128fa5
- add gnome.desktop session for new gdm
cvsdist a128fa5
cvsdist a128fa5
* Wed Aug 27 2003 Alexander Larsson <alexl@redhat.com> 2.3.7-1
cvsdist a128fa5
- update to 2.3.7
cvsdist a128fa5
- require control-center (#100562)
cvsdist a128fa5
cvsdist a128fa5
* Fri Aug 15 2003 Alexander Larsson <alexl@redhat.com> 2.3.6.2-1
cvsdist a128fa5
- update for gnome 2.3
cvsdist a128fa5
cvsdist a128fa5
* Sun Aug 10 2003 Elliot Lee <sopwith@redhat.com> 2.2.2-4
cvsdist a128fa5
- Rebuild
cvsdist a128fa5
cvsdist a128fa5
* Tue Jul 22 2003 Jonathan Blandford <jrb@redhat.com>
cvsdist a128fa5
- at-startup patch to add let at's start
cvsdist a128fa5
cvsdist a128fa5
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
cvsdist a128fa5
- rebuilt
cvsdist a128fa5
cvsdist a128fa5
* Tue Jun  3 2003 Jeff Johnson <jbj@redhat.com>
cvsdist a128fa5
- add explicit epoch's where needed.
cvsdist a128fa5
cvsdist a128fa5
* Tue May 27 2003 Alexander Larsson <alexl@redhat.com> 2.2.2-1
cvsdist a128fa5
- Update to 2.2.2
cvsdist a128fa5
- Add XRandR backport
cvsdist a128fa5
- Fix up old patches, patch7 was upstream
cvsdist a128fa5
cvsdist a128fa5
* Mon Feb 24 2003 Owen Taylor <otaylor@redhat.com> 2.2.0.2-5
cvsdist a128fa5
- Wait for GSD to start before continuing with session
cvsdist a128fa5
cvsdist 0a9215c
* Tue Feb 18 2003 Havoc Pennington <hp@redhat.com> 2.2.0.2-4
cvsdist 0a9215c
- repaint proper area of text in splash screen, #84527
cvsdist 0a9215c
cvsdist 0a9215c
* Tue Feb 18 2003 Havoc Pennington <hp@redhat.com> 2.2.0.2-3
cvsdist 0a9215c
- change icon for magicdev to one that exists in Bluecurve theme
cvsdist 0a9215c
  (part of #84491)
cvsdist 0a9215c
cvsdist 0a9215c
* Thu Feb 13 2003 Havoc Pennington <hp@redhat.com> 2.2.0.2-2
cvsdist 0a9215c
- load icons from icon theme
cvsdist 0a9215c
cvsdist 0a9215c
* Wed Feb  5 2003 Havoc Pennington <hp@redhat.com> 2.2.0.2-1
cvsdist 0a9215c
- 2.2.0.2
cvsdist 0a9215c
cvsdist 0a9215c
* Tue Feb  4 2003 Jonathan Blandford <jrb@redhat.com>
cvsdist 0a9215c
- remove extraneous separator.  Still ugly.
cvsdist 0a9215c
cvsdist 0a9215c
* Wed Jan 29 2003 Havoc Pennington <hp@redhat.com>
cvsdist 0a9215c
- add icons for the stuff in the default session #81489
cvsdist 0a9215c
cvsdist 0a9215c
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
cvsdist 0a9215c
- rebuilt
cvsdist 0a9215c
cvsdist 0a9215c
* Sat Jan 11 2003 Havoc Pennington <hp@redhat.com>
cvsdist 0a9215c
- 2.1.90
cvsdist 0a9215c
- drop purgedelay patch, as it was increased upstream (though only to 2 minutes instead of 5)
cvsdist 0a9215c
cvsdist 0a9215c
* Fri Dec  6 2002 Tim Waugh <twaugh@redhat.com> 2.1.2-2
cvsdist 0a9215c
- Add eggcups to default session.
cvsdist 0a9215c
cvsdist 0a9215c
* Wed Nov 13 2002 Havoc Pennington <hp@redhat.com>
cvsdist 0a9215c
- 2.1.2
cvsdist 0a9215c
cvsdist 12dfcef
* Tue Sep  3 2002 Owen Taylor <otaylor@redhat.com>
cvsdist 12dfcef
- Up purge delay for session manager to 5 minutes to avoid problem 
cvsdist 12dfcef
  with openoffice.org timing out
cvsdist 12dfcef
cvsdist e6040b6
* Wed Aug 28 2002 Havoc Pennington <hp@redhat.com>
cvsdist e6040b6
- put gdm session in here, conflict with old gdm
cvsdist e6040b6
- use DITHER_MAX for dithering to make splash screen look good in 16
cvsdist e6040b6
  bit
cvsdist e6040b6
cvsdist 526b60f
* Tue Aug 27 2002 Havoc Pennington <hp@redhat.com>
cvsdist 526b60f
- fix missing icons and misaligned text in splash
cvsdist 526b60f
cvsdist f721928
* Fri Aug 23 2002 Tim Waugh <twaugh@redhat.com>
cvsdist f721928
- Fix login sound disabling (bug #71664).
cvsdist f721928
cvsdist 3899e20
* Wed Aug 14 2002 Havoc Pennington <hp@redhat.com>
cvsdist d91fb5b
- put rhn applet in default session
cvsdist d91fb5b
cvsdist d91fb5b
* Wed Aug 14 2002 Havoc Pennington <hp@redhat.com>
cvsdist 3899e20
- fix the session file, should speed up login a lot
cvsdist 3899e20
- put magicdev in default session
cvsdist 3899e20
cvsdist 3899e20
* Thu Aug  8 2002 Havoc Pennington <hp@redhat.com>
cvsdist 3899e20
- 2.0.5 with more translations
cvsdist 3899e20
cvsdist 3899e20
* Tue Aug  6 2002 Havoc Pennington <hp@redhat.com>
cvsdist 3899e20
- 2.0.4
cvsdist 3899e20
- remove gnome-settings-daemon from default session
cvsdist 3899e20
cvsdist 3899e20
* Wed Jul 31 2002 Havoc Pennington <hp@redhat.com>
cvsdist 3899e20
- 2.0.3
cvsdist 3899e20
- remove splash screen, require redhat-artwork instead
cvsdist 3899e20
cvsdist 3899e20
* Wed Jul 24 2002 Owen Taylor <otaylor@redhat.com>
cvsdist 3899e20
- Set GTK_RC_FILES so we can change the gtk1 theme
cvsdist 3899e20
cvsdist 3899e20
* Tue Jul 16 2002 Havoc Pennington <hp@redhat.com>
cvsdist 3899e20
- pass --with-halt-command=/usr/bin/poweroff
cvsdist 3899e20
  --with-reboot-command=/usr/bin/reboot
cvsdist 3899e20
cvsdist 3899e20
* Tue Jun 25 2002 Owen Taylor <otaylor@redhat.com>
cvsdist 3899e20
- Version 2.0.1, fixing missing po files
cvsdist 3899e20
cvsdist 3899e20
* Wed Jun 19 2002 Havoc Pennington <hp@redhat.com>
cvsdist 3899e20
- put in new default session with pam-panel-icon
cvsdist 3899e20
- disable schema install in make install, fixes rebuild failure.
cvsdist 3899e20
cvsdist 3899e20
* Sun Jun 16 2002 Havoc Pennington <hp@redhat.com>
cvsdist 3899e20
- rebuild with new libraries
cvsdist 3899e20
cvsdist 38cb97f
* Thu Jun 13 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- rebuild in different environment
cvsdist 38cb97f
cvsdist 38cb97f
* Thu Jun 13 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- add fix from Nalin to build require usermode
cvsdist 38cb97f
cvsdist 38cb97f
* Tue Jun 11 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- 2.0.0
cvsdist 38cb97f
cvsdist 38cb97f
* Mon Jun 10 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- install the schemas, so we get a logout dialog and splash
cvsdist 38cb97f
- put in the splash from 7.3
cvsdist 38cb97f
cvsdist 38cb97f
* Sun Jun 09 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- rebuild in different environment
cvsdist 38cb97f
cvsdist 38cb97f
* Sun Jun 09 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- rebuild in new environment, require newer gtk2
cvsdist 38cb97f
cvsdist 38cb97f
* Sun Jun  9 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- remove obsoletes/provides gnome-core
cvsdist 38cb97f
cvsdist 38cb97f
* Fri Jun 07 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- rebuild in different environment
cvsdist 38cb97f
cvsdist 38cb97f
* Wed Jun  5 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- 1.5.21
cvsdist 38cb97f
cvsdist 38cb97f
* Sun May 26 2002 Tim Powers <timp@redhat.com>
cvsdist 38cb97f
- automated rebuild
cvsdist 38cb97f
cvsdist 38cb97f
* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- rebuild in different environment
cvsdist 38cb97f
cvsdist 38cb97f
* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- 1.5.19
cvsdist 38cb97f
- add more build reqs to chill out build system
cvsdist 38cb97f
- provide gnome-core
cvsdist 38cb97f
cvsdist 38cb97f
* Fri May  3 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- obsolete gnome-core
cvsdist 38cb97f
- 1.5.18
cvsdist 38cb97f
cvsdist 38cb97f
* Fri Apr 19 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- default to metacity
cvsdist 38cb97f
cvsdist 38cb97f
* Tue Apr 16 2002 Havoc Pennington <hp@redhat.com>
cvsdist 38cb97f
- Initial build.
cvsdist 38cb97f
cvsdist 38cb97f