diff --git a/.cvsignore b/.cvsignore index 580f494..ac29cc9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-session-2.2.0.2.tar.bz2 +gnome-session-2.4.0.tar.bz2 diff --git a/gnome-session-2.2.2-icons.patch b/gnome-session-2.2.2-icons.patch new file mode 100644 index 0000000..cdcb4a6 --- /dev/null +++ b/gnome-session-2.2.2-icons.patch @@ -0,0 +1,15 @@ +--- gnome-session-2.2.2/gnome-session/splash-widget.c.icons 2003-05-15 12:03:14.000000000 +0200 ++++ gnome-session-2.2.2/gnome-session/splash-widget.c 2003-05-27 12:42:08.000000000 +0200 +@@ -45,7 +45,11 @@ + { N_("The Panel"), "gnome-panel", "gnome-panel.png" }, + { N_("Session Manager Proxy"), "gnome-smproxy", "gnome-session.png" }, + { N_("Nautilus"), "nautilus", "gnome-ccdesktop.png" }, +- { N_("Desktop Settings"), "gnome-settings-daemon", "gnome-settings.png" } ++ { N_("Desktop Settings"), "gnome-settings-daemon", "gnome-settings.png" }, ++ { N_("Authentication Icon"), "pam-panel-icon", "keyring.png" }, ++ { N_("CD Device Handler"), "magicdev", "gnome-dev-cdrom.png" }, ++ { N_("Red Hat Network Monitor"), "rhn-applet-gui", "up2date.png" }, ++ { N_("Print Monitor"), "eggcups", "printer.png" } + }; + + static const SplashApp * diff --git a/gnome-session.spec b/gnome-session.spec index 962b1e3..ced7188 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,24 +1,24 @@ %define glib2_version 2.2.0 %define pango_version 1.2.0 %define gtk2_version 2.2.0 -%define libgnome_version 2.2.0 -%define libgnomeui_version 2.2.0 -%define libbonobo_version 2.2.0 -%define libbonoboui_version 2.2.0 -%define gnome_vfs2_version 2.2.0 -%define bonobo_activation_version 2.2.0 +%define libgnome_version 2.3.0 +%define libgnomeui_version 2.3.0 +%define libbonobo_version 2.3.0 +%define libbonoboui_version 2.3.0 +%define gnome_vfs2_version 2.3.0 %define gconf2_version 2.2.0 %define po_package gnome-session-2.0 Summary: GNOME session manager Name: gnome-session -Version: 2.2.0.2 -Release: 4 +Version: 2.4.0 +Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-session/%{name}-%{version}.tar.bz2 Source1: Gnome.session Source2: redhat-default-session +Source3: gnome.desktop License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root @@ -27,19 +27,17 @@ Requires: redhat-artwork >= 0.20 Requires: /usr/share/pixmaps/splash/gnome-splash.png # required to get gconf-sanity-check-2 in the right place Requires: GConf2 >= %{gconf2_version} +# Needed for gnome-settings-daemon +Requires: control-center ## we conflict with gdm that contains the GNOME gdm session -Conflicts: gdm < 2.4.0.7-7 - -Patch1: gnome-session-2.1.90-icons.patch -Patch2: gnome-session-2.0.1-gtk1theme.patch -Patch3: gnome-session-2.0.5-login.patch -Patch5: gnome-session-2.0.5-dithering.patch -Patch6: gnome-session-2.1.90-noseparator.patch -## http://bugzilla.gnome.org/show_bug.cgi?id=106037 -Patch7: gnome-session-2.2.0.2-themed-icons.patch +Conflicts: gdm < 1:2.4.0.7-7 + +Patch1: gnome-session-2.2.2-icons.patch +Patch2: gnome-session-2.0.5-login.patch +Patch3: gnome-session-2.0.5-dithering.patch ## http://bugzilla.gnome.org/show_bug.cgi?id=106450 -Patch8: gnome-session-2.2.0.2-splash-repaint.patch +Patch4: gnome-session-2.2.0.2-splash-repaint.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -49,7 +47,6 @@ BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} -BuildRequires: bonobo-activation-devel >= %{bonobo_activation_version} BuildRequires: fontconfig # this is so the configure checks find /usr/bin/halt etc. @@ -64,14 +61,14 @@ GNOME components and handles logout and saving the session. %setup -q %patch1 -p1 -b .icons -%patch2 -p1 -b .gtk1theme -%patch3 -p1 -b .login -%patch5 -p1 -b .dithering -%patch6 -p1 -b .noseparator -%patch7 -p0 -b .themed-icons -%patch8 -p1 -b .splash-repaint +%patch2 -p1 -b .login +%patch3 -p1 -b .dithering +%patch4 -p1 -b .splash-repaint %build +automake-1.4 +autoheader +autoconf %configure --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot make @@ -86,10 +83,13 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL ./mkinstalldirs $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/GNOME +./mkinstalldirs $RPM_BUILD_ROOT/etc/X11/dm/Sessions/ +install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/dm/Sessions/ + /bin/rm $RPM_BUILD_ROOT%{_datadir}/gnome/default.session install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session -/bin/rm -r $RPM_BUILD_ROOT/var/scrollkeeper +#/bin/rm -r $RPM_BUILD_ROOT/var/scrollkeeper ## remove splash screen rm -r $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash @@ -114,13 +114,46 @@ done %{_datadir}/gnome %{_datadir}/control-center-2.0 -%{_datadir}/omf %{_datadir}/man/man*/* %{_bindir}/* %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/X11/gdm +%{_sysconfdir}/X11/dm/Sessions/* %changelog +* Fri Aug 29 2003 Alexander Larsson 2.3.7-3 +- fix up gnome.desktop location + +* Fri Aug 29 2003 Alexander Larsson 2.3.7-2 +- add gnome.desktop session for new gdm + +* Wed Aug 27 2003 Alexander Larsson 2.3.7-1 +- update to 2.3.7 +- require control-center (#100562) + +* Fri Aug 15 2003 Alexander Larsson 2.3.6.2-1 +- update for gnome 2.3 + +* Sun Aug 10 2003 Elliot Lee 2.2.2-4 +- Rebuild + +* Tue Jul 22 2003 Jonathan Blandford +- at-startup patch to add let at's start + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Tue May 27 2003 Alexander Larsson 2.2.2-1 +- Update to 2.2.2 +- Add XRandR backport +- Fix up old patches, patch7 was upstream + +* Mon Feb 24 2003 Owen Taylor 2.2.0.2-5 +- Wait for GSD to start before continuing with session + * Tue Feb 18 2003 Havoc Pennington 2.2.0.2-4 - repaint proper area of text in splash screen, #84527 diff --git a/gnome.desktop b/gnome.desktop new file mode 100755 index 0000000..6fbde99 --- /dev/null +++ b/gnome.desktop @@ -0,0 +1,61 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GNOME +Name[az]=GNOME +Name[be]=GNOME +Name[ca]=GNOME +Name[cs]=GNOME +Name[cy]=GNOME +Name[da]=Gnome +Name[de]=GNOME +Name[el]=GNOME +Name[es]=GNOME +Name[et]=GNOME +Name[fi]=Gnome +Name[fr]=GNOME +Name[he]=GNOME +Name[hu]=GNOME +Name[ko]=그놈 +Name[ms]=GNOME +Name[nl]=GNOME +Name[no]=GNOME +Name[pl]=GNOME +Name[pt]=GNOME +Name[pt_BR]=GNOME +Name[ru]=GNOME +Name[sl]=GNOME +Name[sq]=GNOME +Name[sr]=Гном +Name[sr@Latn]=Gnom +Name[sv]=GNOME +Name[zh_CN]=GNOME +Comment=This session logs you into GNOME +Comment[az]=Bu iclas sizi GNOME'a daxil edəcək +Comment[be]=Гэтая сэсыя завядзе вас у GNOME +Comment[ca]=Aquesta sessió entra en GNOME +Comment[cs]=Toto sezení vás přihlásí do GNOME +Comment[cy]=Mae'r sesiwn hwn yn eich mewngofnodi i GNOME +Comment[da]=Denne session logger dig på Gnome +Comment[de]=Diese Sitzung meldet Sie an GNOME an +Comment[el]=Αυτή η συνεδρία σας εισάγει στο GNOME +Comment[es]=Con esta sesión accede a GNOME +Comment[fi]=Tämä istunto kirjaa sisään Gnomeen +Comment[fr]=Cette session vous connectera dans GNOME +Comment[he]=תצורת הפעלה זו מחברת אותך ל GNOME +Comment[ko]=GNOME세션으로 로그인합니다 +Comment[ms]=Sesi ini akan log anda ke GNOME +Comment[nl]=Deze sessie meldt u aan bij GNOME +Comment[no]=Denne sesjonen logger deg inn til GNOME +Comment[pl]=Sesja logowania do GNOME +Comment[pt]=Esta sessão inicia-o no GNOME +Comment[pt_BR]=Logar no ambiente GNOME +Comment[sl]=Ta seja vas prijavi v GNOMe +Comment[sq]=Kjo seancë do t'ju fusë në GNOME +Comment[sr]=Ова сесија вас пријављује на Гнома +Comment[sr@Latn]=Ova sesija vas prijavljuje na Gnoma +Comment[sv]=Denna session loggar in dig i GNOME +Comment[zh_CN]=此会话使您登录到 GNOME +Exec=gnome-session +# no icon yet, only the top three are currently used +Icon= +Type=Application diff --git a/sources b/sources index 1432a55..7cf3271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e53f68858792c99ee71954f1fef11bc3 gnome-session-2.2.0.2.tar.bz2 +6a7acf3429b927c69e18019f9ec6fa9f gnome-session-2.4.0.tar.bz2