[strigi] move strigiindex_clucene.so to main pkg drop .desktop --vendor (f16+)

[Rex Dieter]

commit 3b071dcfd5f59881577ce6cefc09e0964198a568
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 2 13:40:35 2011 -0500

    move strigiindex_clucene.so to main pkg
    drop .desktop --vendor (f16+)

 strigi.spec |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/strigi.spec b/strigi.spec
index e36066d..494369e 100644
--- a/strigi.spec
+++ b/strigi.spec
@@ -1,7 +1,14 @@
 
+%if 0%{?fedora} && 0%{?fedora} < 16
+%define dt_vendor fedora
+%endif
+
+# toggle off when/if clucene-2.3 lands, it's not compat (yet) -- Rex
+%global clucene 1
+
 Name:		strigi
 Version:	0.7.2
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -26,7 +33,9 @@ Patch100: strigi-0.7.2-kdebug234398.patch
 BuildRequires:  bison
 BuildRequires:  bzip2-devel
 BuildRequires:	cmake >= 2.4.5
+%if 0%{?clucene:1}
 BuildRequires:	clucene-core-devel
+%endif
 BuildRequires:  cppunit-devel
 BuildRequires:  dbus-devel
 BuildRequires:  desktop-file-utils
@@ -76,7 +85,8 @@ Strigi search engine libraries
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} \
-  -DLIB_DESTINATION=%{_libdir} \
+  -DENABLE_CLUCENE:BOOL=%{?clucene:ON}%{!?clucene:OFF} \
+  -DLIB_DESTINATION:PATH=%{_libdir} \
   %{?_cmake_skip_rpath} \
   ..
 popd
@@ -89,7 +99,7 @@ rm -rf %{buildroot}
 make install/fast -C %{_target_platform}  DESTDIR=%{buildroot}
 
 desktop-file-install					\
-	--vendor="fedora"				\
+	--vendor="%{?dt_vendor}"			\
 	--dir=%{buildroot}%{_datadir}/applications	\
 	%{SOURCE1}
 
@@ -117,6 +127,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*strigiclient.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
+%if 0%{?clucene}
+%{_libdir}/strigi/strigiindex_clucene.so
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -134,10 +147,16 @@ rm -rf %{buildroot}
 %{_libdir}/libstrigihtmlgui.so.0*
 %{_libdir}/libstrigiqtdbusclient.so.0*
 %dir %{_libdir}/strigi/
-%{_libdir}/strigi/strigi*.so
+%{_libdir}/strigi/strigiea_*.so
+%{_libdir}/strigi/strigila_*.so
+%{_libdir}/strigi/strigita_*.so
 
 
 %changelog
+* Thu Jun 02 2011 Rex Dieter <rdieter at fedoraproject.org> 0.7.2-9
+- move strigiindex_clucene.so to main pkg
+- drop .desktop --vendor (f16+)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild