merged 1.6 maint branch modifs up to MERGED_TO_TRUNK_20061130

This commit is contained in:
dockes
2006-11-30 13:38:44 +00:00
parent 03b6f05f23
commit 72fd14f208
46 changed files with 417 additions and 245 deletions
+2 -2
View File
@@ -2,11 +2,11 @@
# Date created: 5 December 2005
# Whom: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
#
# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.8 2006/07/26 08:14:38 lbr Exp $
# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.10 2006/11/21 19:45:14 miwi Exp $
#
PORTNAME= recoll
PORTVERSION= 1.5.2
PORTVERSION= 1.6.1
CATEGORIES= deskutils
MASTER_SITES= http://www.lesbonscomptes.com/recoll/
+3 -3
View File
@@ -1,3 +1,3 @@
MD5 (recoll-1.5.2.tar.gz) = 0081c3a91e236edbe01b77ccf12199ba
SHA256 (recoll-1.5.2.tar.gz) = 40eb29970d3eb0afd63366ef76e33c7151557f9b0ed27156530f2f1ce4813289
SIZE (recoll-1.5.2.tar.gz) = 581167
MD5 (recoll-1.5.11.tar.gz) = 72702251bd97fce2ab73dc36430e81ac
SHA256 (recoll-1.5.11.tar.gz) = fa4408c9d761f6901907b10eb64d1b1615d9dcddfae67f1878a70ddb92dd22d2
SIZE (recoll-1.5.11.tar.gz) = 584067
+2 -2
View File
@@ -1,12 +1,11 @@
bin/recoll
bin/recollindex
share/applications/recoll.desktop
share/icons/recoll.png
share/icons/hicolor/48x48/apps/recoll.png
%%DATADIR%%/doc/docbook.css
%%DATADIR%%/doc/usermanual.html
%%DATADIR%%/examples/mimeconf
%%DATADIR%%/examples/mimemap
%%DATADIR%%/examples/rclmon.sh
%%DATADIR%%/examples/recoll.conf
%%DATADIR%%/filters/rcldjvu
%%DATADIR%%/filters/rcldoc
@@ -45,3 +44,4 @@ share/icons/recoll.png
@dirrm %%DATADIR%%/translations
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/icons
+4 -3
View File
@@ -1,5 +1,5 @@
%define name recoll
%define version 1.6.0
%define version 1.6.1
%define release 0
Name: %{name}
@@ -54,13 +54,15 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/applications/recoll.desktop
%{_datadir}/icons/recoll.png
%{_datadir}/icons/hicolor/48x48/apps/recoll.png
%{_mandir}/man1/recoll*
%{_mandir}/man5/recoll*
# ---------------------------------------------------------------------------
%changelog
* Tue Nov 28 2006 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.6.1-1
- Update to release 1.6.1
* Mon Oct 2 2006 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.4.3-1
- Update to release 1.5.3
* Sun May 7 2006 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.4.3-1
@@ -71,4 +73,3 @@ rm -rf $RPM_BUILD_ROOT
- Update to release 1.2.2
* Thu Jan 10 2006 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.1.0-1
- Initial packaging
+4 -2
View File
@@ -1,5 +1,5 @@
%define name recoll
%define version 1.6.0
%define version 1.6.1
%define release %mkrel 1
Name: %{name}
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/applications/recoll.desktop
%{_datadir}/icons/recoll.png
%{_datadir}/icons/hicolor/48x48/apps/recoll.png
%{_datadir}/%{name}
%{_mandir}/man1/recoll*
%{_mandir}/man5/recoll*
@@ -60,6 +60,8 @@ rm -rf $RPM_BUILD_ROOT
# ---------------------------------------------------------------------------
%changelog
* Tue Nov 28 2006 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.6.1-1
- Update to release 1.6.1
* Mon Nov 20 2006 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.5.11-1
- Update to release 1.5.11
* Mon Oct 2 2006 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.5.2-1