From f3d378470fd225b6c7f88e121a492be171643c0ae6fe65320b578c14d93c8ee6 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 20:58:51 +0000 Subject: [PATCH] Accepting request 60852 from home:vuntz:branches:GNOME:Apps Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60852 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/nemiver?expand=0&rev=9 --- nemiver.changes | 11 +++++++++++ nemiver.spec | 25 ++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/nemiver.changes b/nemiver.changes index 2f0ce40..c106eb5 100644 --- a/nemiver.changes +++ b/nemiver.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Feb 12 19:32:38 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. + ------------------------------------------------------------------- Wed Jan 12 19:17:52 CET 2011 - vuntz@opensuse.org diff --git a/nemiver.spec b/nemiver.spec index 3bd6c22..b46e3c2 100644 --- a/nemiver.spec +++ b/nemiver.spec @@ -80,7 +80,7 @@ translation-update-upstream %makeinstall %find_gconf_schemas %suse_update_desktop_file nemiver -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} # remove la files find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print # create symlinks for man pages @@ -88,18 +88,37 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print # create hardlinks for the rest %fdupes $RPM_BUILD_ROOT +%clean +rm -rf "$RPM_BUILD_ROOT" + %pre -f %{name}.schemas_pre %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun -%clean -rm -rf "$RPM_BUILD_ROOT" +%if 0%{?suse_version} > 1130 +%post +%desktop_database_post +%icon_theme_cache_post +%endif + +%if 0%{?suse_version} > 1130 +%postun +%desktop_database_postun +%icon_theme_cache_postun +%endif %files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS README NEWS TODO +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ +%dir %{_datadir}/gnome/help/%{name}/ +%doc %{_datadir}/gnome/help/%{name}/C/ +%dir %{_datadir}/omf/ +%dir %{_datadir}/omf/%{name}/ +%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/* %{_libdir}/nemiver/ %{_datadir}/nemiver/