OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=66

.gitattributes

@@ -23,5 +23,3 @@
 *.zst filter=lfs diff=lfs merge=lfs -text
 ## Specific LFS patterns
 gnome-session-sleep.svg filter=lfs diff=lfs merge=lfs -text
-suse-help.svg filter=lfs diff=lfs merge=lfs -text
-suse.svg filter=lfs diff=lfs merge=lfs -text

gnome-session.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov  6 21:27:25 CET 2008 - vuntz@novell.com
+
+- Move suse.svg and suse-help.svg to gconf2-branding-openSUSE,
+  since that's where the desktop files were moved to.
+- Remove libnotify-devel BuildRequires. It's not required.
+
 -------------------------------------------------------------------
 Tue Oct 28 14:05:23 CEST 2008 - rodrigo@novell.com
 

gnome-session.spec

@@ -31,23 +31,18 @@ BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
 BuildRequires:  libgnomekbd
-BuildRequires:  libnotify-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/GUI/GNOME
 Version:        2.24.1
-Release:        2
+Release:        3
 Summary:        Session Tools for the GNOME 2.x Desktop
 Url:            http://www.gnome.org
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gnome
 Source2:        gnome.desktop
-#PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome suse-help.svg bnc388735 sbrabec@suse.cz
-Source5:        suse-help.svg
-#PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome suse.svg bnc388735 sbrabec@suse.cz
-Source6:        suse.svg
 # Temporarly needed until we get upstream to ship the right icon for suspend
 Source7:        gnome-session-sleep.svg
 # PATCH-FIX-UPSTREAM gnome-session-ice-auth-for-suid.patch hpj@novell.com -- Carries ICE auth over to other UIDs in this session using an env var.
@@ -97,7 +92,7 @@ Summary:        Session Tools for the GNOME 2.x Desktop
 Group:          System/GUI/GNOME
 Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
-Supplements:    packageand(branding-upstream:%{name})
+Supplements:    packageand(%{name}:branding-upstream)
 #BRAND: gnome-splash.png: Splash screen. Bottom 70 pixels are used for
 #BRAND: "just starting" icons. This area is bright in the original
 #BRAND: branding. Must be png or change system gconf key
@@ -154,10 +149,6 @@ install -m644 %{S:7} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
 %find_gconf_schemas
 cat %{name}.schemas_list >%{name}.lst
 %fdupes $RPM_BUILD_ROOT
-# WARNING: We cannot move these icons to another location without
-# providing an homedir update process:
-mkdir -p $RPM_BUILD_ROOT/usr/share/dist/icons
-cp -a %{S:5} %{S:6} $RPM_BUILD_ROOT/usr/share/dist/icons
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -186,7 +177,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/xsessions
 %endif
 %doc %{_mandir}/man?/*.*
-/usr/share/dist
 
 %files branding-upstream
 %defattr (-, root, root)
@@ -195,11 +185,15 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}-2.0.lang
 
 %changelog
+* Thu Nov 06 2008 vuntz@novell.com
+- Move suse.svg and suse-help.svg to gconf2-branding-openSUSE,
+  since that's where the desktop files were moved to.
+- Remove libnotify-devel BuildRequires. It's not required.
 * Tue Oct 28 2008 rodrigo@novell.com
 - Update gnome-session-compiz-as-default-wm.patch to not try
   starting compiz if the ~/.config/compiz/disable-compiz file
   exists (bnc#436873)
-* Thu Oct 23 2008 maw@suse.de
+* Wed Oct 22 2008 maw@suse.de
 - Update to version 2.24.1:
   + Add GTK and GNOME categories to session-properties.desktop
   + Fix leaks
@@ -407,7 +401,7 @@ rm -rf $RPM_BUILD_ROOT
   performance issue when launching new apps in GNOME on a default
   beta1 install -- extreme slowness can happen depending on the
   network setup. Fix bnc#385150, patch by Michael Meeks.
-* Wed Apr 30 2008 vuntz@suse.de
+* Tue Apr 29 2008 vuntz@suse.de
 - Actually copy the right live-installer.desktop (instead of a
   non-existing file) in gnome script so the installer icon appears
   on the desktop.
@@ -489,7 +483,7 @@ rm -rf $RPM_BUILD_ROOT
 - Updated gnome script to detect live install user and create
   desktop entires in the ~/.config/autostart directory to disable
   beagle and opensuse-updater applets.  Bug #326801
-* Thu Sep 20 2007 cgaisford@novell.com
+* Wed Sep 19 2007 cgaisford@novell.com
 - Updated gnome script to create live install desktop file if the
   system is booted into a live install configuration.  Also depends
   on an update to the gnome2-SuSE package which contains the desktop
@@ -497,7 +491,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Sep 19 2007 mauro@suse.de
 - Update to version 2.20.0
   + Updated translations
-* Sat Sep 15 2007 cgaisford@novell.com
+* Fri Sep 14 2007 cgaisford@novell.com
 - Modified the gnome script to copy the SuSE.desktop file to the
   desktop which points to the greeter app #300773
 * Thu Sep 13 2007 jpr@suse.de
@@ -511,10 +505,10 @@ rm -rf $RPM_BUILD_ROOT
 - Update to versino 2.19.92:
   + Fix compiz support in gnome-wm
   + Updated translations.
-* Sat Sep 08 2007 lewing@suse.de
+* Fri Sep 07 2007 lewing@suse.de
 - Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3
   runs. Part of bnc #300773
-* Fri Sep 07 2007 cgaisford@novell.com
+* Thu Sep 06 2007 cgaisford@novell.com
 - Created a patch to fix login and logout sounds in gnome-session
   Novell bug 294396 and bugzilla.gnome.org #466458
 * Tue Sep 04 2007 maw@suse.de
@@ -524,7 +518,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Aug 31 2007 maw@suse.de
 - Update to version 2.19.90:
   + Updated translations.
-* Wed Aug 29 2007 cgaisford@novell.com
+* Tue Aug 28 2007 cgaisford@novell.com
 - Further testing showed that the a11y needs to be done much lower
   in the loop so I've moved it down right before the gtk-main
 * Mon Aug 27 2007 cgaisford@novell.com
@@ -536,10 +530,10 @@ rm -rf $RPM_BUILD_ROOT
   if they are not available.  Fix for Novell Bug 238299
 - Included patch to fix up load time that is pending review
   upstream.  I'll add it to the spec file once approved
-* Wed Aug 08 2007 maw@suse.de
+* Tue Aug 07 2007 maw@suse.de
 - Use %%fdupes
 - Split off a -lang subpackage.
-* Sat Aug 04 2007 dreveman@suse.de
+* Fri Aug 03 2007 dreveman@suse.de
 - Update for compiz 0.5.2, which need glib plugin to be loaded
   before gconf plugin.
 * Fri Aug 03 2007 cgaisford@suse.de
@@ -648,7 +642,7 @@ rm -rf $RPM_BUILD_ROOT
   * Yang Zhang (zh_CN)
 * Wed Apr 04 2007 sbrabec@suse.cz
 - Session start script (gnome) cleanup (#254439).
-* Wed Apr 04 2007 jhargadon@suse.de
+* Tue Apr 03 2007 jhargadon@suse.de
 - specfile cleanup (#255906)
 * Mon Mar 19 2007 jpr@suse.de
 - Update to 2.18.0
@@ -733,19 +727,19 @@ rm -rf $RPM_BUILD_ROOT
   * Use Program instead of Command in the capplet (Tom Tromey)
 * Fri Mar 02 2007 sbrabec@suse.cz
 - Do not own /usr/share/xsessions (#229172).
-* Tue Feb 13 2007 cgaisford@novell.com
+* Mon Feb 12 2007 cgaisford@novell.com
 - updated the UI from changes make in SLED.
-* Mon Jan 08 2007 sbrabec@suse.cz
+* Sun Jan 07 2007 sbrabec@suse.cz
 - Prefix changed to /usr.
 - Spec file cleanup.
-* Sat Dec 23 2006 federico@novell.com
+* Fri Dec 22 2006 federico@novell.com
 - Removed the part of /usr/bin/gnome that overwrites the
   /desktop/gnome/font_rendering/dpi setting in GConf upon the user's
   first login.  With an updated control-center2 package,
   gnome-settings-daemon will take care of figuring out the right DPI
   value.  Fixes the gnome-session part of
   https://bugzilla.novell.com/show_bug.cgi?id=217790.
-* Sun Oct 15 2006 danw@suse.de
+* Sat Oct 14 2006 danw@suse.de
 - Remove dead patches
 - Update and re-enable gnome-session-remove-dns-warning.patch
 * Fri Oct 13 2006 dreveman@suse.de
@@ -782,21 +776,21 @@ rm -rf $RPM_BUILD_ROOT
 - Fix edition of startup programs containing a space in a command line
   argument
 - Add gnome-keyring dependency
-* Wed Aug 02 2006 danw@suse.de
+* Tue Aug 01 2006 danw@suse.de
 - If the session explicitly specifies metacity or compiz, but
   the "wrong" X server for that wm is running, switch back to
   gnome-wm. #180506
 * Fri Jun 16 2006 danw@suse.de
 - Pass --replace to compiz and gnome-window-decorator in case the
   copies run by gdm don't exit properly. #185296
-* Tue Jun 13 2006 rodrigo@suse.de
+* Mon Jun 12 2006 rodrigo@suse.de
 - Added patch to create ~/.config/autostart before starting the
   migration from previous versions (#169509)
 * Fri Jun 02 2006 gekker@suse.de
 - Fix pager on upgrade (#181264)
-* Thu Jun 01 2006 jpr@suse.de
+* Wed May 31 2006 jpr@suse.de
 - Don't run the migration script for new users (#179332)
-* Thu May 25 2006 joeshaw@suse.de
+* Wed May 24 2006 joeshaw@suse.de
 - Fix the gnome script to not break when setting the background on
   multihead setups.  Patch from Erik Jacobsen.  (bnc #178388)
 * Sun May 21 2006 jpr@suse.de
@@ -813,7 +807,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update gnome-wm to pick metacity or compiz based on whether it's
   actually running under Xgl or not, regardless of what
   /etc/sysconfig/displaymanager says. Fixes Xnest logins. #170839.
-* Wed May 03 2006 joeshaw@suse.de
+* Tue May 02 2006 joeshaw@suse.de
 - Don't write out a font using raw XML to the gconf database,
   that's wrong and evil.  Instead, try to set the desktop's DPI
   value using gconftool-2.  (bnc #171096)
@@ -826,14 +820,14 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Apr 13 2006 sbrabec@suse.cz
 - Call %%suse_update_desktop_file.
 - Use new control-center Categories instead of old ones.
-* Sat Apr 08 2006 danw@suse.de
+* Fri Apr 07 2006 danw@suse.de
 - Patch gnome-wm to prefer compiz when Xgl is running
 * Wed Apr 05 2006 hpj@suse.de
 - Fix keyring unlock patch to use g_strlcpy() correctly again.
   Fixes bug #159593 together with a CASA fix.
 * Fri Mar 31 2006 rodrigo@suse.de
 - Added missing "/" for /etc/xdg/autostart searching (#161322)
-* Tue Mar 28 2006 jpr@suse.de
+* Mon Mar 27 2006 jpr@suse.de
 - Handle only shipping 2 sizes of backgrounds
 * Tue Mar 21 2006 rodrigo@suse.de
 - Added support for /etc/xdg/autostart directory, so that
@@ -850,7 +844,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed gnome-session-default-applications.patch, all needed
   applications are now started, if installed, via the autostart
   mechanism.
-* Tue Mar 07 2006 rodrigo@suse.de
+* Mon Mar 06 2006 rodrigo@suse.de
 - Fixed support for multiple system autostart directories.
 - Disable GUI operations for system-wide files (#154755).
 * Thu Mar 02 2006 rodrigo@suse.de
@@ -858,7 +852,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use g_strlcpy instead of strcpy when copying passwords.
 * Wed Feb 22 2006 rodrigo@suse.de
 - Added gnome-session-gsd-early-start.patch that fixes #150256.
-* Fri Feb 17 2006 rodrigo@suse.de
+* Thu Feb 16 2006 rodrigo@suse.de
 - Don't try to remove non-existing files (#145870)
 * Thu Feb 16 2006 rodrigo@suse.de
 - Updated gnome-session-suspend-patch to make suspend work as
@@ -988,7 +982,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update splash for 10.0
 * Tue Aug 09 2005 rodrigo@suse.de
 - Update to 2.11.91, which includes fix for #102652
-* Sat Aug 06 2005 gekker@suse.de
+* Fri Aug 05 2005 gekker@suse.de
 - Start gnome-volume-manager with session
 * Thu Aug 04 2005 gekker@suse.de
 - Start beagle by default, disable with ~/.dontrunbeagle
@@ -1009,7 +1003,7 @@ rm -rf $RPM_BUILD_ROOT
 - Don't run beagle unless ~/.runbeagle exists (#74029)
 * Sat Mar 19 2005 jody@suse.de
 - Enable suspend if it is available. (#73000)
-* Fri Mar 18 2005 clahey@suse.de
+* Thu Mar 17 2005 clahey@suse.de
 - Patch fixes freeze on login.
 * Wed Mar 16 2005 sbrabec@suse.cz
 - Fixed gnome-session-desktop-file.patch (#73047).
@@ -1020,7 +1014,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Mar 07 2005 gekker@suse.de
 - mv suseplugger to default-apps patch
 - launch netapplet, resapplet, and best on startup
-* Sat Feb 26 2005 gekker@suse.de
+* Fri Feb 25 2005 gekker@suse.de
 - Add launch wrapper to launch beagled if installed in file gnome
 * Wed Feb 09 2005 sbrabec@suse.cz
 - Added session desktop file.
@@ -1051,7 +1045,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep 10 2004 hhetter@suse.de
 - run use_default_session again to make the 9.2 distribution
   wallpapers accessible
-* Fri Sep 10 2004 federico@ximian.com
+* Thu Sep 09 2004 federico@ximian.com
 - Added gnome-session-remove-purge-timeout.diff, to fix
   http://bugzilla.gnome.org/show_bug.cgi?id=151664
 - Changed gnome-session-suseplugger.patch to run suseplugger with
@@ -1073,15 +1067,15 @@ rm -rf $RPM_BUILD_ROOT
   Hides the splash-screen once the difault setting gets loaded.
 * Thu Jul 08 2004 sbrabec@suse.cz
 - Added DESKTOP_LAUNCH patch from Jan Holesovsky.
-* Sat Jun 19 2004 dave@suse.de
+* Fri Jun 18 2004 dave@suse.de
 - Don't set the wallpaper or font in the gnome startup script.
-* Sat Jun 12 2004 clahey@suse.de
+* Fri Jun 11 2004 clahey@suse.de
 - Added gnome-session-use-gdmctl.patch.
-* Fri Jun 04 2004 clahey@suse.de
+* Thu Jun 03 2004 clahey@suse.de
 - Switch to Novell session splash screen.
-* Thu Jun 03 2004 mibarra@suse.de
+* Wed Jun 02 2004 mibarra@suse.de
 - Make GNOME use suseplugger
-* Wed May 12 2004 clahey@suse.de
+* Tue May 11 2004 clahey@suse.de
 - Added gnome-session-2.0.5-dithering.patch to use MAX dithering.
 - Added gnome-session-desktop-file.patch to make gnome-session show
   up in control-center.
@@ -1177,7 +1171,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added libjpeg to neededforbuild.
 * Thu Nov 28 2002 hhetter@suse.de
 - updated to version 2.0.9 [GNOME 2.0.3]
-* Tue Nov 12 2002 ro@suse.de
+* Mon Nov 11 2002 ro@suse.de
 - changed neededforbuild <xf86 xdevel> to <x-devel-packages>
 * Wed Nov 06 2002 hhetter@suse.de
 - use correct kde-datadir
@@ -1227,7 +1221,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jun 20 2002 hhetter@suse.de
 - updated to version 2.0.1
 - don't install schemas while make install
-* Mon Jun 17 2002 ro@suse.de
+* Sun Jun 16 2002 ro@suse.de
 - use libpng-devel-packages in neededforbuild
 * Fri Jun 14 2002 hhetter@suse.de
 - provide schema file

suse-help.svg

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c1a274b5d6303c8707ab8df3fca5378abf7f15dc9879d2a6ecfc713de6aafb8
-size 32613

suse.svg

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60308e26adcaa716a7ff3ba424b5dac11905d6e44100ea570a02d8efc00948de
-size 24415