Accepting request 25318 from home:vuntz:branches:GNOME:Factory
Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 25318 revision 2. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/25318 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=74
This commit is contained in:
parent
dba050c2c7
commit
fc49a8570b
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
Name: gnome-session
|
||||
Version: 2.28.0
|
||||
Release: 2
|
||||
License: GPL v2 or later ; LGPL v2.1 or later
|
||||
License: GPL v2 or later
|
||||
Summary: Session Tools for the GNOME 2.x Desktop
|
||||
Url: http://www.gnome.org
|
||||
Group: System/GUI/GNOME
|
||||
@ -65,7 +65,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 +73,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: GPL v2 or later
|
||||
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: GPL v2 or later
|
||||
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,7 +110,8 @@ 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
|
||||
@ -101,15 +123,13 @@ 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 +141,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,9 +149,23 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user