tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

release 1.17.2 packaging and doc touchups

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-05-17 16:15:49 +02:00
parent 6ee73ecd05
commit c22170a1dd
9 changed files with 221 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/rpm/recoll.spec
View File

@ -1,5 +1,5 @@
%define name recoll
%define version 1.17.0
%define version 1.17.2
%define release 0
Name: %{name}
@ -69,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
# ---------------------------------------------------------------------------
%changelog
* Thu May 17 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.2-0
- Update to release 1.17.2
* Sun Mar 18 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.0-0
- Update to release 1.17.0
* Mon Nov 07 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.2-0

216
packaging/rpm/recollfedora10+.spec
View File

@ -1,112 +1,176 @@
Summary: Desktop full text search tool with Qt GUI
Name: recoll
Version: 1.17.0
Version: 1.17.2
Release: 1%{?dist}
Summary: Desktop full text search tool with a qt gui
Group: Applications/Databases
License: GPLv2
URL: http://www.recoll.org/
Source0: http://www.recoll.org/recoll-1.17.0.tar.gz
BuildRequires: qt-devel qt-webkit-devel xapian-core-devel zlib-devel desktop-file-utils
License: GPLv2+
URL: http://www.lesbonscomptes.com/recoll/
Source0: http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
BuildRequires: qt-devel
BuildRequires: qtwebkit-devel
BuildRequires: python-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 backend (Xapian), for
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
# remove execute bit
%{__chmod} 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
%build
QMAKE=qmake-qt4
export QMAKE
export QMAKE=qmake-qt4
%configure
# No smpflags as the builds fails for some reason if -j is used.
make
%{__make} %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%{__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}
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/*
%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/recoll*
%{_mandir}/man5/recoll*
%doc
%{python_sitearch}/Recoll*.egg-info
%{python_sitearch}/recoll.so
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/%{name}index.1*
%{_mandir}/man5/%{name}.conf.5*
%changelog
* Sun Mar 18 2012 J.F. Dockes <jfd@recoll.org> 1.17.9-1
- updated to release 1.16.1
* Wed Sep 28 2011 J.F. Dockes <jfd@recoll.org> 1.16.1-1
- updated to release 1.16.1
* Wed Sep 21 2011 J.F. Dockes <jfd@recoll.org> 1.16.0-1
- updated to release 1.16.0
* Mon May 02 2011 J.F. Dockes <jfd@recoll.org> 1.15.8-1
- updated to release 1.15.8
* Fri Mar 15 2011 J.F. Dockes <jfd@recoll.org> 1.15.5-1
- updated to release 1.15.5
* Thu Feb 15 2011 J.F. Dockes <jfd@recoll.org> 1.15.2-1
- updated to release 1.15.2
* Wed Feb 02 2011 J.F. Dockes <jfd@recoll.org> 1.15.0-1
- updated to release 1.15.0
* Mon Sep 13 2010 J.F. Dockes <jfd@recoll.org> 1.14.0-1
- updated to release 1.14.0
* 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.
* Thu May 17 2012 J.F. Dockes <jf@dockes.org> - 1.17.2-1
- 1.17.2
* Sat Mar 31 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17.1-1
- 1.17.1
* Sun Mar 25 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17-1
- 1.17
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.2-3
- Rebuilt for c++ ABI breakage
* Wed Feb 15 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-2
- Add patch to build with gcc 4.7
* Wed Feb 01 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-1
- 1.16.2
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Oct 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-2
- Add patch to fix crash (bz #747472)
* Tue Oct 18 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-1
- 1.16.1
* Tue May 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-2
- add patch from upstream to fix crash.
* Sun May 08 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-1
- 1.15.8
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.14.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jan 28 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.14.4-1
- 1.14.4
* Mon Nov 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-2
- Add patch to fix #631704
* Sun Nov 7 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-1
- 1.14.2
* Thu Jul 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-6
- add patch to build with xapian 1.2 (from J.F. Dockes, thanks)
* Sat Jul 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-5
- use system xdg-open
- trim chagenlog
* Fri Jul 9 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-4
- fix some review comments
* Mon May 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 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 <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
- 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
* 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 <jfd@recoll.org> 1.13.01-2
- Rpm Spec file updated for recent fedoras: depend on xapian packages, use qt4
- 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
- Update to release 1.11.0
* Fri Sep 12 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.6-1
- Update to release 1.10.6
* Thu May 27 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.2-1
- Update to release 1.10.2
* Thu Jan 31 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.1-1
- Update to release 1.10.1
* Wed Nov 21 2007 Jean-Francois Dockes <jfd@recoll.org> 1.10.0-1
- Update to release 1.10.0
* Tue Sep 11 2007 Jean-Francois Dockes <jfd@recoll.org> 1.9.0-1
- Update to release 1.9.0
* Tue Mar 6 2007 Jean-Francois Dockes <jfd@recoll.org> 1.8.1-1
- Update to release 1.8.1
* Mon Jan 15 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.5-1
- Update to release 1.7.5
* Mon Jan 08 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.3-1
- Update to release 1.7.3
* Tue Nov 28 2006 Jean-Francois Dockes <jfd@recoll.org> 1.6.1-1
- Update to release 1.6.0
* Mon Nov 20 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.11-1
- Update to release 1.5.11
* Mon Oct 2 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.2-1
- Update to release 1.5.2
* Fri Mar 31 2006 Jean-Francois Dockes <jfd@recoll.org> 1.3.2-1
- Update to release 1.3.1
- update to release 1.13.01
* Wed Feb 1 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.0-1
- Initial packaging
- initial packaging

12
packaging/rpm/recollmdk.spec
View File

@ -1,5 +1,5 @@
%define name recoll
%define version 1.17.0
%define version 1.17.2
%define release %mkrel 1
Name: %{name}
@ -13,7 +13,9 @@ Group: Applications/Databases
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
License: GPL
Requires: xapian-core
BuildRequires: libqt4-devel
BuildRequires: libpython-devel
BuildRequires: libxapian-devel
%description
Recoll is a personal full text search package for Linux, FreeBSD and
@ -55,12 +57,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}
%{_mandir}/man1/recoll*
%{_mandir}/man5/recoll*
%{python_sitearch}/Recoll*.egg-info
%{python_sitearch}/recoll.so
# ---------------------------------------------------------------------------
%changelog
* Sun Mar 18 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.0-1
- Update to release 1.17.0
* Thu May 17 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.2-1
- Update to release 1.17.2
* Mon Nov 07 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.2-1
- Update to release 1.16.2
* Wed Sep 28 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.1-1

2
src/configure.ac
View File

@ -401,7 +401,7 @@ else
#echo "qmake version: $qmakevers"
v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'`
if test X$v4 = X0 ; then
AC_MSG_ERROR([qmake seems to indincate using Qt version 3 which is not supported any more])
AC_MSG_ERROR([qmake seems to be using Qt version 3 which is not supported any more])
QTGUI=qtgui
else
AC_MSG_NOTICE([using qt version 4 user interface])

19
website/BUGS.html
View File

@ -77,13 +77,17 @@
<h2><a name="b_1_17_1">recoll 1.17.1</a></h2>
<ul>
<li>The version string is not correctly updated for 1.17.1, the
help dialog and recollindex -v will print 1.17.0.</li>
<li>You can crash the GUI by starting simultaneous queries,
which could be accomplished among others by quickly clicking
the sort order buttons.</li>
<li>When external indexes set as active are not actually
present, the GUI fails to open the db. It should
automatically inactivate them instead.</li>
<li>Does not display thumbnails for files with an URL which
should be encoded (ie: with embedded spaces).</li>
<li>chm filter: url-encoded internal paths are mishandled.</li>
<li>Does not compile on Solaris (flock() issue).</li>
@ -93,13 +97,14 @@
<li>configure --disable-python-module breaks the installation
script.</li>
<li>Does not display thumbnails for files with an URL which
should be encoded (ie: with embedded spaces).</li>
<li>The version string is not correctly updated for 1.17.1, the
help dialog and recollindex -v will print 1.17.0.</li>
<li>The HTML output from Python (rclexecm) filters is not
correctly escaped.</li>
<li>Does not compile with gcc 4.7 (missing include).</li>
<li>Html output from Python (rclexecm) filters is not
correctly escaped.</li>
</ul>

65
website/download.html
View File

@ -51,7 +51,7 @@
<h2><a>General information</a></h2>
<p>The current version is 1.17.1. <a href="release-1.17.html">
<p>The current version is 1.17.2. <a href="release-1.17.html">
Release notes</a>.</p>
<p>The download page for Recoll 1.16 is
@ -106,11 +106,11 @@
<h2><a name="source">Source</a></h2>
<h3>Current release distribution: 1.17.1:</h3>
<h3>Current release distribution: 1.17.2:</h3>
<!-- Attention: source packages must remain here, not in a
subdirectory, because of all the places they're referred from
(package watches) -->
<p><a href="recoll-1.17.1.tar.gz">recoll-1.17.1.tar.gz</a>.
<p><a href="recoll-1.17.2.tar.gz">recoll-1.17.2.tar.gz</a>.
</p>
<!--
@ -180,7 +180,7 @@
<h3>Older recoll releases:</h3>
<p>
<a href="recoll-1.17.0.tar.gz">1.17.0</a>.
<a href="recoll-1.17.1.tar.gz">1.17.1</a>.
<a href="recoll-1.16.2.tar.gz">1.16.2</a>.
<a href="recoll-1.15.9.tar.gz">1.15.9</a>.
<a href="recoll-1.14.4.tar.gz">1.14.4</a>.
@ -219,44 +219,45 @@
least in testing), just use the appropriate Debian repository.</p>
<h3><a name="ubuntu">Ubuntu</a></h3>
<blockquote>
<p>There are Personal Package Archives on launchpad.net for
<a href="http://www.launchpad.net/~xapian-backports/+archive/xapian-1.2">
Xapian</a>,
<a href="https://launchpad.net/~recoll-backports/+archive/recoll-1.15-on">
Recoll, kio-recoll and recoll-lens</a>. These were built from the
latest versions, for a set of Ubuntu series.</p>
<p>There are Personal Package Archives on launchpad.net for
<a href="http://www.launchpad.net/~xapian-backports/+archive/xapian-1.2">
Xapian</a>,
<a href="https://launchpad.net/~recoll-backports/+archive/recoll-1.15-on">
Recoll, kio-recoll and recoll-lens</a>. These were built from the
latest versions, for a set of Ubuntu series.</p>
<p>Ubuntu 10.04 (lucid) and later versions just need the Recoll
PPA. Older versions also needed a backport for Xapian
(xapian-backports/xapian-1.2).</p>
<p>Ubuntu 10.04 (lucid) and later versions just need the Recoll
PPA. Older versions also needed a backport for Xapian
(xapian-backports/xapian-1.2).</p>
<p>Just add the PPA to your system software sources (the
instructions are on the PPA page or
<a href="https://help.launchpad.net/Packaging/PPA/InstallingSoftware">
here</a>), and you can then use the normal package
manager to install or update Recoll.
<p>Just add the PPA to your system software sources (the
instructions are on the PPA page or
<a href="https://help.launchpad.net/Packaging/PPA/InstallingSoftware">
here</a>), and you can then use the normal package
manager to install or update Recoll.
<pre><tt>
sudo add-apt-repository ppa:recoll-backports/recoll-1.15-on
</tt></pre>
</p>
</p>
<p>Only for Ubuntu versions before 9.10 (Karmic):
<p>Only for Ubuntu versions before 9.10 (Karmic):
<pre><tt>
sudo add-apt-repository ppa:recoll-backports/recoll-1.15-on
sudo add-apt-repository ppa:xapian-backports/xapian-1.2
</tt></pre>
</p>
</p>
<p>For Ubuntu 9.04 (Jaunty) and older, you may also have to
explicitely import the Recoll and Xapian public keys:
<p>For Ubuntu 9.04 (Jaunty) and older, you may also have to
explicitely import the Recoll and Xapian public keys:
<pre><tt>
gpg --keyserver keyserver.ubuntu.com --recv 9DA85604
gpg --export --armor 9DA85604 | sudo apt-key add -
gpg --keyserver keyserver.ubuntu.com --recv A0735AD0
gpg --export --armor A0735AD0 | sudo apt-key add -
</tt></pre>
</p>
</p>
</blockquote>
@ -316,13 +317,15 @@ I now use the OpenSUSE build service to create Recoll OpenSUSE packages.
<h3>Mandriva</h3>
<blockquote>
<p>Mandriva linux one 2010 using Qt 4 and the Xapian version
<p>Mandriva linux 2011 using Qt 4 and the Xapian version
from the Mandriva repository.:
<a href="mandriva2010/recoll-1.16.2-1mdv2010.2.i586.rpm">
recoll-1.16.2-1mdv2010.2.i586.rpm</a>.
Source:
<a href="mandriva2010/recoll-1.16.2-1mdv2010.2.src.rpm">
recoll-1.16.2-1mdv2010.2.src.rpm</a>
<a href="mandriva2011/recoll-1.17.2-1-mdv2011.0.i586.rpm">
recoll-1.17.2-1-mdv2011.0.i586.rpm</a>,
<a href="recoll-debug-1.17.2-1-mdv2011.0.i586.rpm">
recoll-debug-1.17.2-1-mdv2011.0.i586.rpm</a>. <br>
Source:
<a href="mandriva2011/recoll-1.17.2-1.src.rpm">
recoll-1.17.2-1.src.rpm</a>
</p>
</blockquote>
@ -365,7 +368,7 @@ I now use the OpenSUSE build service to create Recoll OpenSUSE packages.
</ol>
<p>Recoll is then available from the command line and as an icon in
the usual MacPorts applications place.</p>
the usual MacPorts applications place.</p>
<h2><a name="translations">Translations</a></h2>

6
website/index.html.en
View File

@ -42,7 +42,7 @@
<p><span class="application">Recoll</span> is free, open source,
and licensed under the GPL. The current version is
<a href="download.html">1.17.1</a>
<a href="download.html">1.17.2</a>
(<a href="release-1.17.html">Release notes</a>).</p>
<p class="remark">Recoll will index an <b>MS-Word</b> document stored as
@ -69,6 +69,10 @@
<h2>News: </h2>
<div class="news">
<ul>
<li>2012-05-16: Release 1.17.2 fixes a few minor bugs in
1.17. See the <a href="release-1.17.html">Release
notes</a>. </li>
<li>2012-04-07: we now have a Chinese user manual: Recoll现在有中文手册咯：
<a href="http://stupidbeauty.com/Blog/2012/03/recoll%E7%94%A8%E6%88%B6%E6%89%8B%E5%86%8A%E7%BF%BB%E8%AD%AF%EF%BC%8Crecoll-user-manual-2/">
Recoll中文手册，HTML</a></li>

9
website/index.html.fr
View File

@ -47,7 +47,7 @@
<p><span class="application">Recoll</span> est un logiciel libre
gratuit, dont le code source est disponible sous licence GPL.
La dernière version est
<a class="important" href="download.html">1.17.1</a>
<a class="important" href="download.html">1.17.2</a>
(<a href="release-1.17.html">notes sur la version, en
anglais</a>)</p>
@ -100,12 +100,13 @@
<h2>Nouvelles: </h2>
<ul>
<li>2012-03-24: La version <a href="download.html#source">1.17.1</a>
est disponible. Voir les <a href="release-1.17.html">les notes</a>.
<li>2012-05-16: Sortie de la
version <a href="download.html#source">1.17.2</a>. Voir
les <a href="release-1.17.html">les notes</a>.
</li>
<li>2010-11-20 : un petit script pour activer/cacher recoll sur un
bureau gnome d'un seul coup de clavier:
bureau gnome d'un seul coup de clavier:
<a href="http://bitbucket.org/medoc/recoll/wiki/HotRecoll">
recette d'installation</a>.</li>

17
website/release-1.17.html
View File

@ -11,7 +11,7 @@
<meta name="Keywords" content=
"full text search, desktop search, unix, linux">
<meta http-equiv="Content-language" content="en">
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="robots" content="All,Index,Follow">
<link type="text/css" rel="stylesheet" href="styles/style.css">
@ -55,9 +55,6 @@
release 1.15 or older.</li>
</ul>
<p>1.17.1 was released only for a small function needed for
supporting the Unity Lens. If you don't need it, you can stay
with 1.17.0.</p>
<h2>Notes to the kind packagers:</h2>
@ -79,6 +76,18 @@
of a webkit-based result list), but relatively few obvious
changes for the casual user.</p>
<p>1.17.1 was released only for a small function needed for
supporting the Unity Lens. If you don't need it, you can stay
with 1.17.0.</p>
<p>1.17.2 fixes a few <a href="BUGS.html#b_1_17_1">bugs</a> and
adds a small feature for handling characters that should not
be accented in your language (ie: å in swedish). See
<tt>unac_except_trans</tt>x in the manual configuration
section. Also a new <tt>rcldia</tt> filter for Dia files.</p>
<p>Recoll 1.17.0 changes:</p>
<ul>
<li>GUI/config: new set of dialogs to set up the indexing