Accepting request 60757 from home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60757
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=89
This commit is contained in:
Vincent Untz 2011-02-13 21:07:12 +00:00 committed by Git OBS Bridge
parent 258692adad
commit eab4a581bd
2 changed files with 37 additions and 12 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sun Feb 13 12:50:11 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.
+ %mime_database_post/postun because the package ships a mime
type definition.
- 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.
-------------------------------------------------------------------
Thu Jan 13 09:57:07 CET 2011 - vuntz@opensuse.org

View File

@ -67,14 +67,15 @@ Patch14: gnome-control-center-system-proxy-configuration.patch
Patch28: gnome-control-center-use-settings-menu.patch
Url: http://www.gnome.org
Requires: nautilus gnome-settings-daemon gnome-menus
Requires: %{name}-lang = %{version}
Recommends: %{name}-lang
Provides: control-center2 = 2.22.1
Obsoletes: control-center2 < 2.22.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%description
This package contains the control center for the GNOME 2.x Desktop.
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
%package devel
License: GPLv2+
@ -85,14 +86,15 @@ Provides: control-center2-devel = 2.22.1
Obsoletes: control-center2-devel < 2.22.1
%description devel
This package contains the control center for the GNOME 2.x Desktop.
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
%package -n libgnome-window-settings1
License: GPLv2+
Summary: Utility library for getting window manager settings
Group: Development/Libraries/GNOME
Group: Development/Libraries/GNOME
Requires: %{name}-lang = %{version}
Recommends: %{name}-lang
%description -n libgnome-window-settings1
This library is used by the GNOME control center to change preferences
@ -138,9 +140,9 @@ make %{?jobs:-j%jobs}
%endif
rm -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name}-2.0
%find_lang %{name}-2.0 %{?no_lang_C}
# help files
%find_lang control-center %{name}-2.0.lang
%find_lang control-center %{?no_lang_C} %{name}-2.0.lang
%find_gconf_schemas
%suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc DesktopSettings
# capplets
@ -165,18 +167,18 @@ rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%desktop_database_post
%icon_theme_cache_post
%mime_database_post
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%postun
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%desktop_database_postun
%icon_theme_cache_postun
%mime_database_postun
%post -n libgnome-window-settings1 -p /sbin/ldconfig
@ -185,6 +187,13 @@ fi
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%dir %{_datadir}/gnome/
%dir %{_datadir}/gnome/help/
%dir %{_datadir}/gnome/help/control-center/
%doc %{_datadir}/gnome/help/control-center/C/
%dir %{_datadir}/omf/
%dir %{_datadir}/omf/control-center/
%doc %{_datadir}/omf/control-center/control-center-C.omf
%{_sbindir}/gnome-display-properties-install-systemwide
%{_bindir}/*
%{_sysconfdir}/xdg/autostart/*.desktop