Accepting request 61049 from GNOME:Factory

Accepted submit request 61049 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/61049
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=100
This commit is contained in:
Ruediger Oertel 2011-02-14 00:12:27 +00:00 committed by Git OBS Bridge
commit b8b9114a0b
2 changed files with 32 additions and 4 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Feb 13 12:50:45 CET 2011 - vuntz@opensuse.org
- Call relevant macros in %post/%postun:
+ %desktop_database_post/postun because the package ships at
least one desktop file.
+ %icon_theme_cache_post/postun because the package ships themed
icons.
- Pass %{?no_lang_C} to %find_lang so that english documentation
can be packaged with the program, and not in the lang subpackage.
- Change Requires of lang subpackage to Recommends, since the
english documentation is not there anymore.
- Remove 2.x references in summaries and descriptions.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 17 13:52:01 CET 2010 - dimstar@opensuse.org Wed Nov 17 13:52:01 CET 2010 - dimstar@opensuse.org

View File

@ -21,7 +21,7 @@ Name: gnome-session
Version: 2.32.1 Version: 2.32.1
Release: 1 Release: 1
License: GPLv2+ License: GPLv2+
Summary: Session Tools for the GNOME 2.x Desktop Summary: Session Tools for the GNOME Desktop
Url: http://www.gnome.org Url: http://www.gnome.org
Group: System/GUI/GNOME Group: System/GUI/GNOME
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
@ -51,7 +51,6 @@ BuildRequires: libupower-glib-devel
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Requires: %{name}-lang = %{version}
Requires: %{name}-core = %{version} Requires: %{name}-core = %{version}
# Programs that are in the default session (we use Requires since Recommends # 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 # might make it possible for some people to get an empty gnome-session, and
@ -60,6 +59,7 @@ Requires: gnome-panel
Requires: gnome-settings-daemon Requires: gnome-settings-daemon
Requires: metacity Requires: metacity
Requires: nautilus Requires: nautilus
Recommends: %{name}-lang
Obsoletes: gnome-core Obsoletes: gnome-core
# There's no splash anymore, so no branding package. # There's no splash anymore, so no branding package.
Provides: %{name}-branding = %{version} Provides: %{name}-branding = %{version}
@ -71,7 +71,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This package provides the basic session tools, like session management This package provides the basic session tools, like session management
functionality, for the GNOME 2.x Desktop. functionality, for the GNOME Desktop.
%package core %package core
License: GPLv2+ License: GPLv2+
@ -125,19 +125,33 @@ install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
%suse_update_desktop_file gnome-wm %suse_update_desktop_file gnome-wm
%suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal
%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
%find_lang %{name}-2.0 %find_lang %{name}-2.0 %{?no_lang_C}
%find_gconf_schemas %find_gconf_schemas
%fdupes %{buildroot} %fdupes %{buildroot}
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
%post
%desktop_database_post
%icon_theme_cache_post
%postun
%desktop_database_postun
%icon_theme_cache_postun
%pre core -f %{name}.schemas_pre %pre core -f %{name}.schemas_pre
%post core
%icon_theme_cache_post
%posttrans core -f %{name}.schemas_posttrans %posttrans core -f %{name}.schemas_posttrans
%preun core -f %{name}.schemas_preun %preun core -f %{name}.schemas_preun
%postun core
%icon_theme_cache_postun
%files %files
%defattr (-, root, root) %defattr (-, root, root)
%{_bindir}/gnome %{_bindir}/gnome