From 085695e93cf67d3789ded65a1cc9a47c142e3883 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Tue, 28 Jun 2005 19:58:30 +0000 Subject: [PATCH] - Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802) --- evolution.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index efd39cd..09cbc5d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ExcludeArch: ppc64 Name: evolution Version: 2.2.2 -Release: 9.fc5 +Release: 10.fc5 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -73,6 +73,9 @@ Patch107: evolution-2.2.2-move-autosave-file.patch Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch +# Move .conduit files from share to lib (for the sake of multilib) +Patch802: evolution-2.2.2-fix-conduit-dir.patch + Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -189,6 +192,7 @@ Development files needed for building things which link against evolution. %patch800 -p0 -b .fix-conduits %patch801 -p0 -b .fix-evo-conduit-memleaks +%patch802 -p1 -b .fix-conduit-dir mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -242,8 +246,8 @@ if pkg-config openssl ; then fi %endif -# Rerun autoconf since we patched configure.in (patch for new-mail-notify plugin): -autoconf +# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths): +autoreconf -i %configure \ --enable-gtk-doc=yes \ @@ -338,7 +342,7 @@ rm -rf $RPM_BUILD_ROOT %if %{pilot_support} %dir %{_libdir}/evolution/%{evo_major}/conduits %{_libdir}/evolution/%{evo_major}/conduits/*.so -%{_datadir}/gnome-pilot/conduits/* +%{_libdir}/gnome-pilot/conduits/*.conduit %endif %files devel @@ -348,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Mon Jun 27 2005 David Malcolm - 2.2.2-10.fc5 +- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802) + * Mon Jun 27 2005 David Malcolm - 2.2.2-9.fc5 - Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817) - Added Mark G Adams's memory leak fix (patch 801)