From ac7b09f4adcb335fd3d3ffa78347a3ef4bac610c517e102806a41008e426fd37 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 20:51:51 +0000 Subject: [PATCH] Accepting request 60744 from home:vuntz:branches:GNOME:Apps Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60744 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=26 --- gbrainy.changes | 11 +++++++++++ gbrainy.spec | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/gbrainy.changes b/gbrainy.changes index 620564b..ec4ac93 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Feb 10 15:09:16 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. +- Use %{?no_lang_C} instead of %no_lang_C to fix build on 11.3 and + earlier. + ------------------------------------------------------------------- Wed Jan 26 19:38:18 UTC 2011 - dimstar@opensuse.org diff --git a/gbrainy.spec b/gbrainy.spec index 9d9cc1e..59ba813 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -83,7 +83,7 @@ make %install %makeinstall %suse_update_desktop_file %name Game -%find_lang %{name} %no_lang_C +%find_lang %{name} %{?no_lang_C} rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps # It's not the right size: 32x32 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gbrainy.png @@ -93,9 +93,23 @@ rm %{buildroot}%{_libdir}/pkgconfig/gbrainy.pc %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 %defattr(-,root,root) %doc AUTHORS NEWS README COPYING +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ %dir %{_datadir}/gnome/help/gbrainy/ %doc %{_datadir}/gnome/help/gbrainy/C/ %{_bindir}/gbrainy