diff --git a/GnomeOnlineHelp.desktop b/GnomeOnlineHelp.desktop deleted file mode 100644 index 72a7b1c..0000000 --- a/GnomeOnlineHelp.desktop +++ /dev/null @@ -1,23 +0,0 @@ -[Desktop Entry] -Name=Online Help -Encoding=UTF-8 -Icon=/usr/share/dist/icons/suse-help.svg -Type=Link -URL=http://help.opensuse.org/ -OnlyShowIn=GNOME; - -X-SuSE-translate=true -Name[cs]=Online nápověda -Name[da]=Online hjælp -Name[fi]=Online ohje -Name[hu]=Online súgó -Name[it]=Aiuto in linea -Name[km]=ជំនួយ​លើ​បណ្ដាញ -Name[nb]=Online-hjelp -Name[pa]=ਆਨਲਾਇਨ ਮੱਦਦ -Name[pl]=Pomoc online -Name[pt]=Ajuda Online -Name[ru]=Интерактивная помощь -Name[sv]=Online-hjälp -Name[uk]=Довідка -X-SuSE-added=Name,uk;Name,sv;Name,ru;Name,pt;Name,pl;Name,pa;Name,nb;Name,km;Name,it;Name,hu;Name,fi;Name,da;Name,cs; diff --git a/SuSE.desktop b/SuSE.desktop deleted file mode 100644 index 3d2db0d..0000000 --- a/SuSE.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=ggreeter /usr/lib/ggreeter/greeter.exe -Name=openSUSE -Encoding=UTF-8 -Icon=/usr/share/dist/icons/suse.svg -OnlyShowIn=GNOME; - diff --git a/gnome b/gnome index f7881ac..646e0fb 100644 --- a/gnome +++ b/gnome @@ -62,15 +62,6 @@ else touch ~/.skel/sled10-run fi -# Install the online help desktop icon this way until there is -# a better solution. The actual files reside in gnome2-SuSE -if [ ! -e $HOME/.skel/.gnome2-run-10.3 ] ; then - touch $HOME/.skel/.gnome2-run-10.3 - mkdir -p ~/Desktop - cp -u /usr/share/dist/desktop-files/GnomeOnlineHelp.desktop ~/Desktop - cp -u /usr/share/dist/desktop-files/SuSE.desktop ~/Desktop -fi - # Install the live install desktop icon this way until there is # a better solution. The actual files reside in gnome2-SuSE # the /usr/share/applications/YaST2/live-installer.desktop exists on a live install system diff --git a/gnome-session-2.23.92.tar.bz2 b/gnome-session-2.23.92.tar.bz2 deleted file mode 100644 index e16f755..0000000 --- a/gnome-session-2.23.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6967128140cfa9451668637fb17dd13ec4e775ce5e64cfb3bc1256395fdea5c5 -size 809838 diff --git a/gnome-session-2.24.0.tar.bz2 b/gnome-session-2.24.0.tar.bz2 new file mode 100644 index 0000000..47524f7 --- /dev/null +++ b/gnome-session-2.24.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37d456a6f74b92e05c5945e484fef95116394c974116b7d25cfbccc32d4a184b +size 797656 diff --git a/gnome-session.changes b/gnome-session.changes index d6b83a0..c5635e2 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Oct 6 16:42:06 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- +Tue Sep 23 18:21:03 CDT 2008 - maw@suse.de + +- Update to version 2.24.0: + + Convert the username to UTF-8 in the logout dialog + + Fix leaks + + Turn off debugging by default + + Updated translations. + +------------------------------------------------------------------- +Mon Sep 22 2008 - federico@novell.com + +- Removed SuSE.desktop and GnomeOnlineHelp.desktop from the sources, + as well as the logic in the /usr/bin/gnome script to copy these + files to the user's Desktop. This is now handled in the + gconf2-branding-openSUSE package, as Nautilus can now handle desktop + items defined by the sysadmin. + ------------------------------------------------------------------- Thu Sep 11 16:06:45 CEST 2008 - rodrigo@suse.de diff --git a/gnome-session.spec b/gnome-session.spec index 8470015..2485a60 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.23.92) +# spec file for package gnome-session (Version 2.24.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,25 +19,33 @@ Name: gnome-session -BuildRequires: PolicyKit-gnome-devel control-center2-devel fdupes -BuildRequires: gnome-common gnome-desktop-devel -BuildRequires: gnome-keyring-devel gnome-patch-translation -BuildRequires: gnome-settings-daemon-devel hicolor-icon-theme intltool -BuildRequires: libglade2-devel libgnomekbd libnotify-devel perl-XML-Parser -BuildRequires: tcpd-devel update-desktop-files +BuildRequires: PolicyKit-gnome-devel +BuildRequires: control-center2-devel +BuildRequires: fdupes +BuildRequires: control-center2-devel +BuildRequires: fdupes +BuildRequires: gnome-common +BuildRequires: gnome-desktop-devel +BuildRequires: gnome-keyring-devel +BuildRequires: gnome-patch-translation +BuildRequires: gnome-settings-daemon-devel +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.23.92 +Version: 2.24.0 Release: 1 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 GnomeOnlineHelp.desktop bnc388735 sbrabec@suse.cz -Source3: GnomeOnlineHelp.desktop -#PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome SuSE.desktop bnc388735 sbrabec@suse.cz -Source4: SuSE.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 @@ -48,15 +56,15 @@ Source7: gnome-session-sleep.svg Patch0: gnome-session-ice-auth-for-suid.patch # PATCH-FIX-UPSTREAM gnome-session-kdm-support.patch hpj@novell.com -- Adds support for KDM logout commands. Patch1: gnome-session-kdm-support.patch -#PATCH-FIX-OPENSUSE gnome-session-wm-switch.patch bnc180506 danw@novell.com -- Fixes legacy sessions to use gnome-wm instead of metacity/compiz. +# PATCH-FIX-OPENSUSE gnome-session-wm-switch.patch bnc180506 danw@novell.com -- Fixes legacy sessions to use gnome-wm instead of metacity/compiz. Patch2: gnome-session-wm-switch.patch -#PATCH-FIX-UPSTREAM gnome-session-bgo507101-tile-ui.patch bgo507101 vuntz@novell.com -- Tile UI for logout dialog +# PATCH-NEEDS-REBASE gnome-session-bgo507101-tile-ui.patch bgo507101 vuntz@novell.com -- Tile UI for logout dialog. Was: PATCH-FIX-UPSTREAM Patch3: gnome-session-bgo507101-tile-ui.patch -#PATCH-FEATURE-OPENSUSE gnome-session-gnome-wm-compiz-manager.patch vuntz@novell.com -- Launch compiz-manager when configured. +# PATCH-FEATURE-OPENSUSE gnome-session-gnome-wm-compiz-manager.patch vuntz@novell.com -- Launch compiz-manager when configured. Patch4: gnome-session-gnome-wm-compiz-manager.patch -#PATCH-FIX-OPENSUSE gnome-session-bnc389137-splash-layout.patch bnc389137 vuntz@novell.com -- Improve layout with our splash screen. +# PATCH-FIX-OPENSUSE gnome-session-bnc389137-splash-layout.patch bnc389137 vuntz@novell.com -- Improve layout with our splash screen. Patch5: gnome-session-bnc389137-splash-layout.patch -#PATCH-FEATURE-OPENSUSE gnome-session-compiz-as-default-wm.patch fate304762 rodrigo@novell.com -- Run compiz as default WM whenever possible +# PATCH-FEATURE-OPENSUSE gnome-session-compiz-as-default-wm.patch fate304762 rodrigo@novell.com -- Run compiz as default WM whenever possible Patch6: gnome-session-compiz-as-default-wm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: control-center2 @@ -90,6 +98,7 @@ License: GPL v2 or later; LGPL v2.1 or later 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}) #BRAND: gnome-splash.png: Splash screen. Bottom 70 pixels are used for #BRAND: "just starting" icons. This area is bright in the original @@ -117,7 +126,7 @@ Authors: %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p0 +# %patch3 -p0 %patch4 -p1 %patch5 -p1 %patch6 -p0 @@ -127,9 +136,9 @@ Authors: autoreconf -f -i # needed for gnome-session--2.17.91: #export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure\ - --with-rsh-command=/usr/bin/rsh \ - --with-at-spi-registryd-directory=%{_prefix}/lib/at-spi +%configure \ + --with-rsh-command=/usr/bin/rsh \ + --with-at-spi-registryd-directory=%{_prefix}/lib/at-spi %__make %{?jobs:-j%jobs} %install @@ -147,10 +156,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 -# This part of code comes from gnome2-SuSE -# FIXME: Needs branding, needs upgrade process for user homedirs -mkdir -p $RPM_BUILD_ROOT/usr/share/dist/desktop-files -cp -a %{S:3} %{S:4} $RPM_BUILD_ROOT/usr/share/dist/desktop-files # WARNING: We cannot move these icons to another location without # providing an homedir update process: mkdir -p $RPM_BUILD_ROOT/usr/share/dist/icons @@ -192,6 +197,20 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}-2.0.lang %changelog +* Mon Oct 06 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881). +* Wed Sep 24 2008 maw@suse.de +- Update to version 2.24.0: + + Convert the username to UTF-8 in the logout dialog + + Fix leaks + + Turn off debugging by default + + Updated translations. +* Mon Sep 22 2008 federico@novell.com +- Removed SuSE.desktop and GnomeOnlineHelp.desktop from the sources, + as well as the logic in the /usr/bin/gnome script to copy these + files to the user's Desktop. This is now handled in the + gconf2-branding-openSUSE package, as Nautilus can now handle desktop + items defined by the sysadmin. * Thu Sep 11 2008 rodrigo@suse.de - suse_update_desktop_file the gnome-wm.desktop file. - Added Hidden=true to gnome-wm.desktop file.