From c24fcede2376f30684abac85e91c01cc72900740f32c273a4425d3f62576b913 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 12 Jan 2007 00:21:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=2 --- evolution.changes | 6 ++++++ evolution.spec | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/evolution.changes b/evolution.changes index 499bdbe..4c455c0 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 10 18:25:02 CET 2007 - sbrabec@suse.cz + +- Do not remove files from %{_libdir}/evolution/2.8 - these are + standard libraries, not modules. + ------------------------------------------------------------------- Tue Jan 9 11:43:53 CET 2007 - sbrabec@suse.cz diff --git a/evolution.spec b/evolution.spec index 57cda7e..2255748 100644 --- a/evolution.spec +++ b/evolution.spec @@ -344,9 +344,7 @@ cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/pixma %find_lang evolution-2.8 %find_gconf_schemas cat evolution-2.8.lang %{name}.schemas_list >%{name}.lst -# FIXME: Modules should be unversioned -rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*.so -rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*.*a $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.*a +rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.*a rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info %clean @@ -380,7 +378,7 @@ fi %{_libdir}/bonobo/servers/*.server %dir %{_libdir}/evolution %dir %{_libdir}/evolution/* -%{_libdir}/evolution/*/lib* +%{_libdir}/evolution/*/*.so.* %{_libdir}/evolution/*/components %dir %{_libdir}/evolution/*/conduits %{_libdir}/evolution/*/plugins @@ -396,6 +394,8 @@ fi %defattr(-,root,root) %{_includedir}/* %{_libdir}/pkgconfig/*.pc +%{_libdir}/evolution/*/*.so +%{_libdir}/evolution/*/*.*a %files pilot %defattr(-,root,root) @@ -403,6 +403,9 @@ fi %{_libdir}/evolution/*/conduits/*.so %changelog -n evolution +* Wed Jan 10 2007 - sbrabec@suse.cz +- Do not remove files from %%{_libdir}/evolution/2.8 - these are + standard libraries, not modules. * Tue Jan 09 2007 - sbrabec@suse.cz - More spec file cleanups. * Wed Dec 13 2006 - maw@suse.de