From 224cf96afc0e5ab083276d9721bc229f0fcfad92 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 17 Mar 2012 19:32:45 +0000 Subject: [PATCH] - cleaned up obsolete entries from _noauto* lists; explicit pixmaps/desktop files Changed files: icedove.spec -> 1.148 --- icedove.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/icedove.spec b/icedove.spec index 68366ed..1f9cb2e 100644 --- a/icedove.spec +++ b/icedove.spec @@ -23,7 +23,7 @@ %define nspr_ver 4.8.8 %define nss_ver 3.12.10 -# convert firefox release number to platform version: 9.0.x -> 9.0.x +# convert thunderbird release number to platform version: 9.0.x -> 9.0.x %define xulrunner_main 10.0 %define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#10.0}) @@ -114,12 +114,11 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+ # iceweasel/icedove/iceape provide their own versions -%define _noautoreqdep libgfxpsshar.so libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpistub.so %define _noautoprovfiles %{_libdir}/%{name}/components # we don't want these to satisfy xulrunner-devel -%define _noautoprov libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so libxpcom_core.so +%define _noautoprov libmozjs.so libxpcom.so libxul.so # and as we don't provide them, don't require either -%define _noautoreq libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so libxpcom_core.so +%define _noautoreq libmozjs.so libxpcom.so libxul.so %define topdir %{_builddir}/%{name}-%{version} %define objdir %{topdir}/obj-%{_target_cpu} @@ -496,8 +495,8 @@ exit 0 %{_libdir}/%{name}/res %{_libdir}/%{name}/searchplugins -%{_pixmapsdir}/*.png -%{_desktopdir}/*.desktop +%{_pixmapsdir}/icedove.png +%{_desktopdir}/icedove.desktop %dir %{_datadir}/%{name} %{_datadir}/%{name}/chrome -- 2.44.0