Open Source Projects Europe

--- a/packaging/rpm/recollfedora10.spec
+++ b/packaging/rpm/recollfedora10+.spec
@@ -1,19 +1,14 @@
 Name:           recoll
-Version:        1.12.0
-Release:        1%{?dist}
+Version:        1.13.04
+Release:        2%{?dist}
 Summary:        Desktop full text search tool with a qt gui
 
 Group:          Applications/Databases
-License:        GPL
+License:        GPLv2
 URL:            http://www.recoll.org/
-Source0:        http://www.recoll.org/recoll-1.12.0.tar.gz 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://www.recoll.org/recoll-1.13.04.tar.gz 
 
-# Not sure how easy it is to find a xapian-core rpm. Will be easier to
-# build by hand for many. Run time uses a static link to xapian, doesnt
-# depend on libxapian.so
-BuildRequires:  qt-devel zlib-static
-Requires:       qt
+BuildRequires:  qt-devel xapian-core-devel zlib-devel desktop-file-utils
 
 %description
 Recoll is a personal full text search package for Linux, FreeBSD and
@@ -25,29 +20,50 @@
 %setup -q
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+QMAKE=qmake-qt4 
+export QMAKE
 %configure
-make %{?_smp_mflags} static
+# No smpflags as the builds fails for some reason if -j is used.
+make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+desktop-file-install --delete-original \
+  --dir=%{buildroot}/%{_datadir}/applications \
+  %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_datadir}/applications/recoll-searchgui.desktop
-%{_datadir}/icons/hicolor/48x48/apps/recoll.png
+%{_datadir}/applications/%{name}-searchgui.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/recoll*
 %{_mandir}/man5/recoll*
 %doc
 
-
 %changelog
+* Sun May 9 2010  J.F. Dockes <jfd@recoll.org> 1.13.04-2
+- Bumped the release number to issue new rpms for fc10
+* Sun May 9 2010  J.F. Dockes 1.13.04
+- spec file updated to recoll release 1.13.04. 
+* Fri Feb 12 2010 Terry Duell 1.13.02
+- updated to release 1.13.02
+* Mon Jan 12 2010 Terry Duell 1.13.01-3
+- rpm spec file updated to fix Fedora desktop-file-install and install icon
+* Sun Jan 10 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-2
+- Rpm Spec file updated for recent fedoras: depend on xapian packages, use qt4
+* Thu Jan 07 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-1
+- Update to release 1.13.01
+* Thu Dec 10 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.4-1
+- Update to release 1.12.4
 * Thu Jan 29 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.0-1
 - Update to release 1.12.0
 * Mon Oct 13 2008 Jean-Francois Dockes <jfd@recoll.org> 1.11.0-1