diff --git a/gnome-session.changes b/gnome-session.changes index abdd29f..863e1ea 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org + +- Add BuildRequires and Requires on gconf-sanity-check, which was + split from the main gconf2 package. + +------------------------------------------------------------------- +Wed Dec 2 11:55:47 CET 2009 - vuntz@opensuse.org + +- Update the way we remove the ha/ig locales for old versions of + openSUSE. + +------------------------------------------------------------------- +Tue Dec 1 15:21:51 CET 2009 - vuntz@opensuse.org + +- Split the gnome-settings-daemon helper into a gtk1-support + subpackage, that will only gets installed if gtk1 is installed. + This should remove some unneeded cruft on login for most people. +- Add --enable-splash configure option, and ship the splash screen + in a splash subpackage. +- Fix rpmlint warning about self-obsoletion. +- Fix license: it's GPLv2+ and not "GPLv2+;LGPLv2.1+". + ------------------------------------------------------------------- Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 898425d..b884279 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -19,8 +19,8 @@ Name: gnome-session Version: 2.28.0 -Release: 2 -License: GPL v2 or later ; LGPL v2.1 or later +Release: 3 +License: GPLv2+ Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org Group: System/GUI/GNOME @@ -43,6 +43,7 @@ Patch4: gnome-session-enable-disable-compiz.patch Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes +BuildRequires: gconf-sanity-check BuildRequires: gconf2-devel BuildRequires: gnome-common BuildRequires: gnome-patch-translation @@ -54,6 +55,7 @@ BuildRequires: update-desktop-files Requires: %{name}-lang = %{version} Requires: ConsoleKit Requires: dbus-1-x11 +Requires: gconf-sanity-check Requires: hicolor-icon-theme # Programs that are in the default session (we use Requires since Recommends # might make it possible for some people to get an empty gnome-session, and @@ -65,7 +67,7 @@ Requires: nautilus Obsoletes: gnome-core # There's no splash anymore, so no branding package. Provides: %{name}-branding = %{version} -Obsoletes: %{name}-branding <= %{version} +Obsoletes: %{name}-branding < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -73,6 +75,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package provides the basic session tools, like session management functionality, for the GNOME 2.x Desktop. +%package gtk1-support +License: GPLv2+ +Summary: GTK+ 1.x compatibility layer for gnome-session +Requires: %{name} = %{version} +Supplements: packageand(gnome-session:gtk) + +%description gtk1-support +This helper makes GTK+ 1.x applications feel more integrated in +modern GNOME desktops, by setting the GTK_RC_FILES environment +variable during the GNOME session initialization. + +%package splash +License: GPLv2+ +Summary: Splash screen for gnome-session +Requires: %{name} = %{version} + +%description splash +The splash screen is displayed to indicate that the GNOME session +is loading. It is not installed by default because the GNOME +session is considered to start fast enough. + %lang_package %prep %setup -q @@ -89,27 +112,29 @@ gnome-patch-translation-update %build NOCONFIGURE=1 gnome-autogen.sh %configure \ - --with-default-wm=gnome-wm + --with-default-wm=gnome-wm \ + --enable-splash %__make %{?jobs:-j%jobs} %install %makeinstall -# +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif # install startup script and xsession file install -d -m755 %{buildroot}%{_bindir} install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +%suse_update_desktop_file gnome-session-splash %suse_update_desktop_file gnome-settings-daemon-helper %suse_update_desktop_file gnome-wm %suse_update_desktop_file session-properties X-SuSE-ControlCenter-System %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %find_lang %{name}-2.0 %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst -# Temporary workaround: still installed by the package -rm -f %{buildroot}%{_datadir}/pixmaps/splash/gnome-splash.png %fdupes %{buildroot} %clean @@ -121,7 +146,7 @@ rm -rf %{buildroot} %preun -f %{name}.schemas_preun -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* @@ -129,16 +154,24 @@ rm -rf %{buildroot} %{_datadir}/gnome-session %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop -%{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/icons/hicolor/*/*/*.* %doc %{_mandir}/man?/*.* +# Exclude files shipped in other subpackages +%exclude %{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper +%exclude %{_libdir}/gnome-session/helpers/gnome-session-splash + +%files gtk1-support +%defattr (-, root, root) +%{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop +%{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper + +%files splash +%defattr (-, root, root) +%{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop +%{_libdir}/gnome-session/helpers/gnome-session-splash +%dir %{_datadir}/pixmaps/splash +%{_datadir}/pixmaps/splash/gnome-splash.png %files lang -f %{name}-2.0.lang -## ha/ig does not exist in Factory currently -##%if %suse_version <= 1110 -# exclude locales which don't exist on old versions of openSUSE -%exclude %{_datadir}/locale/ha/LC_MESSAGES/* -%exclude %{_datadir}/locale/ig/LC_MESSAGES/* -##%endif %changelog