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
+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