From 7f1a53d0af97fec2866d320b9187bc9f38ade7e3 Mon Sep 17 00:00:00 2001 From: Terje R�sten Date: Aug 09 2010 17:43:14 +0000 Subject: Importing recoll. --- diff --git a/.gitignore b/.gitignore index e69de29..b0a20af 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +recoll-1.13.04.tar.gz diff --git a/recoll-1.13.04-optflags.patch b/recoll-1.13.04-optflags.patch new file mode 100644 index 0000000..241c038 --- /dev/null +++ b/recoll-1.13.04-optflags.patch @@ -0,0 +1,12 @@ +--- recoll-1.13.04/qt4gui/recoll.pro.in~ 2010-01-30 08:58:40.000000000 +0100 ++++ recoll-1.13.04/qt4gui/recoll.pro.in 2010-05-10 12:04:00.699877583 +0200 +@@ -1,7 +1,7 @@ +-TEMPLATE = app ++BTEMPLATE = app + LANGUAGE = C++ + +-CONFIG += qt warn_on thread release debug ++CONFIG += qt warn_on thread release + + HEADERS += \ + ../qtgui/advsearch_w.h \ diff --git a/recoll.spec b/recoll.spec new file mode 100644 index 0000000..c6dd1c3 --- /dev/null +++ b/recoll.spec @@ -0,0 +1,132 @@ +Name: recoll +Version: 1.13.04 +Release: 6%{?dist} +Summary: Desktop full text search tool with Qt GUI + +Group: Applications/Databases +License: GPLv2+ +URL: http://www.lesbonscomptes.com/recoll/ +Source0: http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz +Patch0: recoll-1.13.04-optflags.patch +Patch1: http://www.lesbonscomptes.com/recoll/files/xapian12.patch +BuildRequires: qt-devel +BuildRequires: zlib-devel +BuildRequires: aspell-devel +BuildRequires: xapian-core-devel +BuildRequires: desktop-file-utils +Requires: xdg-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +Recoll is a personal full text search package for Linux, FreeBSD and +other Unix systems. It is based on a very strong back end (Xapian), for +which it provides an easy to use, feature-rich, easy administration +interface. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p2 +# remove execute bit +%{__chmod} 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h} + +%build +export QMAKE=qmake-qt4 +%configure +%{__make} %{?_smp_mflags} + +%install +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p' + +desktop-file-install --delete-original \ + --dir=%{buildroot}/%{_datadir}/applications \ + %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop + +# use /usr/bin/xdg-open +%{__rm} -f %{buildroot}/usr/share/recoll/filters/xdg-open + +%post +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi +if [ -x %{_bindir}/update-desktop-database ] ; then + %{_bindir}/update-desktop-database &> /dev/null +fi +exit 0 + +%postun +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi +if [ -x %{_bindir}/update-desktop-database ] ; then + %{_bindir}/update-desktop-database &> /dev/null +fi +exit 0 + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, -) +%doc COPYING ChangeLog README +%{_bindir}/%{name} +%{_bindir}/%{name}index +%{_datadir}/%{name} +%{_datadir}/applications/%{name}-searchgui.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/pixmaps/%{name}.png +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}index.1* +%{_mandir}/man5/%{name}.conf.5* + +%changelog +* Thu Jul 15 2010 Terje Rosten - 1.13.04-6 +- add patch to build with xapian 1.2 (from J.F. Dockes, thanks) + +* Sat Jul 10 2010 Terje Rosten - 1.13.04-5 +- use system xdg-open +- trim chagenlog + +* Fri Jul 9 2010 Terje Rosten - 1.13.04-4 +- fix some review comments + +* Mon May 10 2010 Terje Rosten - 1.13.04-3 +- use version macro in source url +- don't strip bins, giving non empty debuginfo package +- more explicit file listing +- try to preserve timestamps +- use proper name for spec file +- fix changelog +- license seems to be GPLv2+ +- include some %%doc files +- add buildroot tag +- some source add execute bit set +- explicit enable inotify +- add aspell-devel to bulldreq +- make with _smp_mflags seems to work +- add post scripts +- add patch to build gui with correct flags (ref: 338791) + +* Sun May 9 2010 J.F. Dockes 1.13.04-2 +- bumped the release number to issue new rpms for fc10 + +* Sun May 9 2010 J.F. Dockes 1.13.04 +- 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 +- updated to fix Fedora desktop-file-install and install icon + +* Sun Jan 10 2010 Jean-Francois Dockes 1.13.01-2 +- updated for recent fedoras: depend on xapian packages, use qt4 + +* Thu Jan 07 2010 Jean-Francois Dockes 1.13.01-1 +- update to release 1.13.01 + +* Wed Feb 1 2006 Jean-Francois Dockes 1.2.0-1 +- initial packaging diff --git a/sources b/sources index e69de29..628298e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +eba9d639dbac149996a92b9b2dffc5ee recoll-1.13.04.tar.gz diff --git a/xapian12.patch b/xapian12.patch new file mode 100644 index 0000000..af10185 --- /dev/null +++ b/xapian12.patch @@ -0,0 +1,35 @@ +diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rcldb.cpp +--- a/src/rcldb/rcldb.cpp Tue May 04 15:40:13 2010 +0200 ++++ b/src/rcldb/rcldb.cpp Tue May 04 15:40:40 2010 +0200 +@@ -33,7 +33,7 @@ + using namespace std; + #endif /* NO_NAMESPACES */ + +-#include "xapian/version.h" ++#include "xapian.h" + + #include "rclconfig.h" + #include "rcldb.h" +diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rclquery.cpp +--- a/src/rcldb/rclquery.cpp Tue May 04 15:40:13 2010 +0200 ++++ b/src/rcldb/rclquery.cpp Tue May 04 15:40:40 2010 +0200 +@@ -8,7 +8,7 @@ + #include + #include + +-#include "xapian/sorter.h" ++#include "xapian.h" + + #include "rcldb.h" + #include "rcldb_p.h" +diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/stemdb.cpp +--- a/src/rcldb/stemdb.cpp Tue May 04 15:40:13 2010 +0200 ++++ b/src/rcldb/stemdb.cpp Tue May 04 15:40:40 2010 +0200 +@@ -12,7 +12,6 @@ + #include + + #include +-#include + + #include "stemdb.h" + #include "wipedir.h"