From 40d169cc8eda073bbcefd13c5a1861c6413f0bc75f85cbdf1652009a4e7afb69 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 10 Mar 2008 17:45:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=34 --- gnome-session-2.21.91.tar.bz2 | 3 -- gnome-session-2.21.92.tar.bz2 | 3 ++ gnome-session-dist-splash.patch | 11 ------ gnome-session.changes | 19 ++++++++++ gnome-session.spec | 62 +++++++++++++++++++++++++++------ 5 files changed, 74 insertions(+), 24 deletions(-) delete mode 100644 gnome-session-2.21.91.tar.bz2 create mode 100644 gnome-session-2.21.92.tar.bz2 delete mode 100644 gnome-session-dist-splash.patch diff --git a/gnome-session-2.21.91.tar.bz2 b/gnome-session-2.21.91.tar.bz2 deleted file mode 100644 index fad2e27..0000000 --- a/gnome-session-2.21.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03f5dc2f1909d9a0022d4f6418736cef4793a7279e7a7f543eddb239aafff0d1 -size 762472 diff --git a/gnome-session-2.21.92.tar.bz2 b/gnome-session-2.21.92.tar.bz2 new file mode 100644 index 0000000..705bad3 --- /dev/null +++ b/gnome-session-2.21.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73bc1a00f614403ae5900b4b6e92fc451c67fc57417f0c481979fd6bc9762476 +size 766160 diff --git a/gnome-session-dist-splash.patch b/gnome-session-dist-splash.patch deleted file mode 100644 index adfedf5..0000000 --- a/gnome-session-dist-splash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/gnome-session.schemas.in -+++ data/gnome-session.schemas.in -@@ -50,7 +50,7 @@ - /apps/gnome-session/options/splash_image - gnome - string -- splash/gnome-splash.png -+ /usr/share/dist/splash/dist-splash.png - - Preferred Image to use for login splash screen - This is a relative path value based off the $datadir/pixmaps/ directory. Sub-directories and image names are valid values. Changing this value will effect the next session login. diff --git a/gnome-session.changes b/gnome-session.changes index 2b114e0..1511565 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Mar 10 14:59:49 CET 2008 - sbrabec@suse.cz + +- Require bug-buddy and its bi-arch counterpart (bnc#354164). + +------------------------------------------------------------------- +Wed Mar 5 00:45:06 CET 2008 - maw@suse.de + +- Update to version 2.21.92: + + Require recent versions of gnome-keyring + + Correctly handle the env. variables given by gnome-keyring to + make it work in the whole session + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 4 14:08:32 CET 2008 - sbrabec@suse.cz + +- Split branding subpackage (fate#301792). + ------------------------------------------------------------------- Wed Feb 20 18:16:38 CET 2008 - maw@suse.de diff --git a/gnome-session.spec b/gnome-session.spec index 304d16e..87dfaae 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.21.91) +# spec file for package gnome-session (Version 2.21.92) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ Name: gnome-session BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gnome-keyring-devel gnome-patch-translation gnome-settings-daemon-devel hicolor-icon-theme intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME -Version: 2.21.91 +Version: 2.21.92 Release: 1 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 @@ -33,8 +33,6 @@ Patch5: gnome-session-2.12.0-su-session-management.patch Patch7: gnome-session-2.19.92-kdm-support.patch #PATCH-FEATURE-UPSTREAM gnome-session-motd.patch bgo159604 rodrigo@novell.com -- Needs to get upstream or be dropped Patch8: gnome-session-motd.patch -#PATCH-FIX-SUSE gnome-session-dist-splash.patch jpr@novell.com -- Point at distro specific splash screen -Patch9: gnome-session-dist-splash.patch #PATCH-FIX-SUSE gnome-session-compiz.patch bnc170839 maw@novell.com Patch10: gnome-session-compiz.patch #PATCH-FIX-SUSE gnome-session-wm-switch.patch bnc180506 danw@novell.com @@ -51,11 +49,19 @@ Patch16: gnome-session-sound.patch Patch17: gnome-session-gcc4.3-fixes.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on Recommends: control-center2 Obsoletes: gnome-core Requires: hicolor-icon-theme +Requires: %{name}-branding Suggests: rsh +# bug-buddy is required for GTK_MODULES=gnomebreakpad: +Requires: bug-buddy +%ifarch x86_64 s390x +Recommends: bug-buddy-32bit +%endif +%ifarch ppc +Recommends: bug-buddy-64bit +%endif %gconf_schemas_prereq %description @@ -64,6 +70,30 @@ functionality, for the GNOME 2.x Desktop. +Authors: +-------- + Tom Tromey + Felix Bellaby + Ralph Mor, X Consortium + + +%package branding-upstream +Summary: Session Tools for the GNOME 2.x Desktop +Group: System/GUI/GNOME +Provides: %{name}-branding = %{version} +Supplements: 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 +#BRAND: /apps/gnome-session/options/splash_image +#BRAND: Upstream uses 420x293 pixels in GNOME 2.20. + +%description branding-upstream +This package provides the basic session tools, like session management +functionality, for the GNOME 2.x Desktop. + + + Authors: -------- Tom Tromey @@ -81,7 +111,6 @@ gnome-patch-translation-prepare %patch5 -p1 %patch7 %patch8 -%patch9 -p0 %patch10 %patch12 %patch13 @@ -94,7 +123,7 @@ gnome-patch-translation-update %build autoreconf -f -i # needed for gnome-session--2.17.91: -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ --with-rsh-command=/usr/bin/rsh \ --with-at-spi-registryd-directory=%{_prefix}/lib/at-spi @@ -128,18 +157,31 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_datadir}/applications/session-properties.desktop %{_datadir}/gnome/default.session -# %{_datadir}/gnome/default.wm -%{_datadir}/pixmaps/* %{_datadir}/xsessions/*.desktop %{_datadir}/icons/hicolor/*/*/*.* -%doc %{_mandir}/man?/*.* +%dir %{_datadir}/pixmaps/splash %if %suse_version <= 1020 %dir %{_datadir}/xsessions %endif +%doc %{_mandir}/man?/*.* + +%files branding-upstream +%defattr (-, root, root) +%{_datadir}/pixmaps/splash/gnome-splash.png %files lang -f %{name}-2.0.lang %changelog +* Mon Mar 10 2008 sbrabec@suse.cz +- Require bug-buddy and its bi-arch counterpart (bnc#354164). +* Wed Mar 05 2008 maw@suse.de +- Update to version 2.21.92: + + Require recent versions of gnome-keyring + + Correctly handle the env. variables given by gnome-keyring to + make it work in the whole session + + Updated translations. +* Tue Mar 04 2008 sbrabec@suse.cz +- Split branding subpackage (fate#301792). * Wed Feb 20 2008 maw@suse.de - Update to version 2.21.91: + Make login sound work again