From bfa00140f12398ee022a68174796c9220b9f0fff Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sun, 6 Mar 2011 15:23:32 +0100 Subject: [PATCH] release 1.15.5 packaging updates --- packaging/debian/buildppa.sh | 2 +- packaging/debian/debiankio/changelog | 16 +++------- packaging/debian/debianrclqt4/changelog | 4 +++ packaging/rpm/recoll.spec | 17 +++++++--- packaging/rpm/recollfedora10+.spec | 6 ++-- packaging/rpm/recollmdk.spec | 4 ++- website/download.html | 42 ++++++++++++++----------- 7 files changed, 52 insertions(+), 39 deletions(-) diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index d20955b3..5dc39b50 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -4,7 +4,7 @@ # For the kio: (and kdesdk?) # sudo apt-get install pkg-kde-tools cdbs -RCLVERS=1.15.2 +RCLVERS=1.15.5 PPAVERS=1 case $RCLVERS in diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog index a60ffc9b..85d06d68 100644 --- a/packaging/debian/debiankio/changelog +++ b/packaging/debian/debiankio/changelog @@ -1,36 +1,28 @@ +kio-recoll (1.15.5-0~ppa1~SERIES1) SERIES; urgency=low + * Update to recoll version 1.15.5 + -- Jean-Francois Dockes Fri, 04 Mar 2011 13:54:00 +0200 + kio-recoll (1.15.2-0~ppa1~SERIES1) SERIES; urgency=low - * Update to recoll version 1.15.2 - -- Jean-Francois Dockes Thu, 15 Feb 2011 08:43:00 +0200 kio-recoll (1.15.0-0~ppa1~SERIES1) SERIES; urgency=low - * Update to recoll version 1.15.0 - -- Jean-Francois Dockes Wed, 02 Feb 2011 09:48:00 +0200 kio-recoll (1.14.3-0~ppa1~SERIES1) SERIES; urgency=low - * Update to recoll version 1.14.3 - -- Jean-Francois Dockes Thu, 25 Nov 2010 10:25:00 +0200 kio-recoll (1.14.2-0~ppa1~SERIES1) SERIES; urgency=low - * Update to recoll version 1.14.2 - -- Jean-Francois Dockes Sat, 25 Sep 2010 09:37:20 +0200 kio-recoll (1.13.01-0~ppa4~SERIES1) SERIES; urgency=low - * Update to recoll version 1.13.01 - -- Jean-Francois Dockes Thu, 07 Jan 2010 11:26:00 +0100 kio-recoll (1.12.3-0~ppa4~jaunty1) jaunty; urgency=low - * Initial release - -- Jean-Francois Dockes Tue, 24 Nov 2009 08:55:00 +0100 diff --git a/packaging/debian/debianrclqt4/changelog b/packaging/debian/debianrclqt4/changelog index d6fcaff8..c0b72ac1 100644 --- a/packaging/debian/debianrclqt4/changelog +++ b/packaging/debian/debianrclqt4/changelog @@ -1,3 +1,7 @@ +recoll (1.15.5-0~ppa1~SERIES1) SERIES; urgency=low + * Updated package to recoll version 1.15.5 + -- Jean-Francois Dockes Fri, 04 Mar 2011 13:54:00 +0200 + recoll (1.15.2-0~ppa1~SERIES1) SERIES; urgency=low * Updated package to recoll version 1.15.2 -- Jean-Francois Dockes Mon, 14 Feb 2011 21:54:00 +0200 diff --git a/packaging/rpm/recoll.spec b/packaging/rpm/recoll.spec index 0a2521b1..04ff605e 100644 --- a/packaging/rpm/recoll.spec +++ b/packaging/rpm/recoll.spec @@ -1,5 +1,5 @@ %define name recoll -%define version 1.15.2 +%define version 1.15.5 %define release 0 Name: %{name} @@ -14,9 +14,7 @@ Group: Applications/Databases BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot License: GPL -# We build with a static link to xapian to avoid depending on xapian -BuildRequires: libqt4-devel zlib-devel-static -Requires: libqt4 +BuildRequires: libqt4-devel zlib-devel-static libxapian-devel libuuid-devel %description Recoll is a personal full text search package for Linux, FreeBSD and @@ -34,7 +32,7 @@ interface. %build %configure -make %{?_smp_mflags} static +make %{?_smp_mflags} # --------------------------------------------------------------------------- @@ -58,10 +56,19 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/recoll.png %{_mandir}/man1/recoll* %{_mandir}/man5/recoll* +%if 0%{?suse_version} > 1120 +%dir %{_datadir}/applications +%dir %{_datadir}/pixmaps +%endif +%dir %{_datadir}/icons/hicolor/48x48/apps +%dir %{_datadir}/icons/hicolor/48x48 +%dir %{_datadir}/icons/hicolor # --------------------------------------------------------------------------- %changelog +* Fri Mar 04 2011 Jean-Francois Dockes 1.15.5-0 +- Update to release 1.15.2 * Thu Feb 15 2011 Jean-Francois Dockes 1.15.2-0 - Update to release 1.15.2 * Thu Feb 2 2011 Jean-Francois Dockes 1.15.0-0 diff --git a/packaging/rpm/recollfedora10+.spec b/packaging/rpm/recollfedora10+.spec index 580db87c..68e53597 100644 --- a/packaging/rpm/recollfedora10+.spec +++ b/packaging/rpm/recollfedora10+.spec @@ -1,12 +1,12 @@ Name: recoll -Version: 1.15.2 +Version: 1.15.5 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.15.2.tar.gz +Source0: http://www.recoll.org/recoll-1.15.5.tar.gz BuildRequires: qt-devel xapian-core-devel zlib-devel desktop-file-utils @@ -50,6 +50,8 @@ rm -rf %{buildroot} %doc %changelog +* Fri Mar 15 2011 J.F. Dockes 1.15.5-1 +- updated to release 1.15.5 * Thu Feb 15 2011 J.F. Dockes 1.15.2-1 - updated to release 1.15.2 * Wed Feb 02 2011 J.F. Dockes 1.15.0-1 diff --git a/packaging/rpm/recollmdk.spec b/packaging/rpm/recollmdk.spec index feb45a93..1613a6a9 100644 --- a/packaging/rpm/recollmdk.spec +++ b/packaging/rpm/recollmdk.spec @@ -1,5 +1,5 @@ %define name recoll -%define version 1.15.2 +%define version 1.15.5 %define release %mkrel 1 Name: %{name} @@ -59,6 +59,8 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------------- %changelog +* Fri Mar 04 2011 Jean-Francois Dockes 1.15.5-1 +- Update to release 1.15.5 * Thu Feb 15 2011 Jean-Francois Dockes 1.15.2-1 - Update to release 1.15.2 * Wed Feb 02 2011 Jean-Francois Dockes 1.15.0-1 diff --git a/website/download.html b/website/download.html index 18dff1dc..4a2ac4e4 100644 --- a/website/download.html +++ b/website/download.html @@ -233,17 +233,23 @@ gpg --export --armor A0735AD0 | sudo apt-key add -

These builds are not statically linked, but depend on the regular Xapian and zlib rpms from the Fedora repositories.
Fedora 12 - - recoll-1.15.2-1.fc12.i586.rpm. + + recoll-1.15.5-1.fc12.i586.rpm. Source: - - recoll-1.15.2-1.fc12.src.rpm + + recoll-1.15.5-1.fc12.src.rpm
Fedora 13 - - recoll-1.15.2-1.fc13.i586.rpm. + + recoll-1.15.5-1.fc13.i586.rpm. Source: - - recoll-1.15.2-1.fc13.src.rpm + + recoll-1.15.5-1.fc13.src.rpm +
Fedora 14 + + recoll-1.15.5-1.fc14.i586.rpm. + Source: + + recoll-1.15.5-1.fc14.src.rpm

@@ -252,10 +258,10 @@ gpg --export --armor A0735AD0 | sudo apt-key add -

OpenSUSE 11.3 with qt4 and a static link to xapian 1.2.3 with the --disable-sse configure option: - - recoll-1.15.2-0.i586.rpm. - Source: - recoll-1.15.2-0.src.rpm

+ + recoll-1.15.5-0.i586.rpm. + Source: + recoll-1.15.5-0.src.rpm

Mandriva

@@ -263,11 +269,11 @@ gpg --export --armor A0735AD0 | sudo apt-key add -

Mandriva linux one 2010 with Qt 4 and a static link to Xapian 1.2.3 with the --without-sse configure option.: - - recoll-1.15.2-1mdv2010.2.i586.rpm. + + recoll-1.15.5-1mdv2010.2.i586.rpm. Source: - - recoll-1.15.2-1mdv2010.2.src.rpm + + recoll-1.15.5-1mdv2010.2.src.rpm

@@ -288,8 +294,8 @@ gpg --export --armor A0735AD0 | sudo apt-key add - following (except that the port is currently (10-2010) broken).

FreeBSD 7.3 i386 Qt 4.7.1 Statically linked to Xapian 1.2.3 with --disable-sse: - - recoll-1.15.2-FreeBSD-7.3-STABLE.tgz + + recoll-1.15.5-FreeBSD-7.3-STABLE.tgz