[sylpheed] Fix plugin installation

[Christoph Wickert]

commit 3dcbcef93678e6d1c084959cbf71b1613af52378
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Jan 30 21:56:45 2012 +0100

    Fix plugin installation

 sylpheed.spec |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/sylpheed.spec b/sylpheed.spec
index 0a7a647..6e6af6e 100644
--- a/sylpheed.spec
+++ b/sylpheed.spec
@@ -1,11 +1,16 @@
 # should be vendor 'fedora', but that would break upgrades for
 # people who have linked the desktop icon
 %global desktopvendor redhat
+
+%global is_prerelease 1
+
+%if 0%{?is_prerelease}
 %global prerelease beta3
+%endif
 
 Name:           sylpheed
 Version:        3.2.0
-Release:        0.2%{?prerelease}%{?dist}
+Release:        0.3%{?prerelease:.%{?prerelease}}%{?dist}
 Summary:        GTK+ based, lightweight, and fast email client
 
 Group:          Applications/Internet
@@ -79,7 +84,7 @@ this package contains development files only
 
 
 %prep
-%setup -qn%{name}-%{version}%{?prerelease}
+%setup -q %{?prerelease:-n %{name}-%{version}%{?prerelease}}
 %patch0 -p1 -b .dsofix
 %patch1 -p1 -b .defs.h
 %patch2 -p1 -b .desktop
@@ -88,6 +93,7 @@ this package contains development files only
 
 %build
 %configure --enable-ssl --disable-updatecheck \
+    --with-plugindir=%{_libdir}/%{name}/plugins \
     %{!?_without_gpgme:--enable-gpgme} \
     %{?_without_compface:--disable-compface} \
     %{!?_without_ldap:--enable-ldap} \
@@ -110,11 +116,22 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+
+# Install plugins
+for plugin in attachment_tool test ; do
+    pushd plugin/$plugin
+    make install-plugin DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+    popd
+done
+
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 
+# Install an icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -p -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
+
+# Install menu entries
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor %{desktopvendor} \
     --add-category=Network \
   %if 0%{?fedora} > 14
@@ -123,8 +140,11 @@ desktop-file-install --vendor %{desktopvendor} \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --delete-original \
     ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
+# Install the manpage
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+
 %find_lang %{name}
 
 
@@ -152,9 +172,11 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/applications/%{desktopvendor}-%{name}.desktop
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
+%{_libdir}/sylpheed/
 %{_libdir}/libsylpheed-plugin-0.so.*
 %{_libdir}/libsylph-0.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
 %doc PLUGIN.txt 
@@ -163,7 +185,10 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/*.so
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-0.2beta3
+* Mon Jan 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 3.2.0-0.3.beta3
+- Fix plugin installation
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-0.2.beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Thu Sep 08 2011 Christoph Wickert <cwickert at fedoraproject.org> - 3.2.0-0.1.beta3