From 9010aa80746fbacd924ea7be60bb91c98bf32bee Mon Sep 17 00:00:00 2001 From: dockes Date: Wed, 20 Jan 2010 07:42:25 +0000 Subject: [PATCH] change mail address --- packaging/rpm/recoll.spec | 32 ++++++++--------- packaging/rpm/recollfedora.spec | 59 ++++++++++++++++++------------- packaging/rpm/recollfedora10.spec | 30 ++++++++-------- packaging/rpm/recollmdk.spec | 34 +++++++++--------- 4 files changed, 82 insertions(+), 73 deletions(-) diff --git a/packaging/rpm/recoll.spec b/packaging/rpm/recoll.spec index ff87e09c..3ad00c62 100644 --- a/packaging/rpm/recoll.spec +++ b/packaging/rpm/recoll.spec @@ -61,35 +61,35 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------------- %changelog -* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 +* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 - Update to release 1.12.0 -* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 +* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 - Update to release 1.11.0 -* Thu Sep 11 2008 Jean-Francois Dockes 1.10.6-1 +* Thu Sep 11 2008 Jean-Francois Dockes 1.10.6-1 - Update to release 1.10.6 -* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 +* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 - Update to release 1.10.2 -* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 +* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 - Update to release 1.10.1 -* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 +* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 - Update to release 1.10.0 -* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 +* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 - Update to release 1.9.0 -* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 +* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 - Update to release 1.8.1 -* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 +* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 - Update to release 1.7.5 -* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 +* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 - Update to release 1.7.3 -* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 +* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 - Update to release 1.6.1 -* Mon Oct 2 2006 Jean-Francois Dockes 1.4.3-1 +* Mon Oct 2 2006 Jean-Francois Dockes 1.4.3-1 - Update to release 1.5.3 -* Sun May 7 2006 Jean-Francois Dockes 1.4.3-1 +* Sun May 7 2006 Jean-Francois Dockes 1.4.3-1 - Update to release 1.4.3 -* Fri Mar 31 2006 Jean-Francois Dockes 1.3.3-1 +* Fri Mar 31 2006 Jean-Francois Dockes 1.3.3-1 - Update to release 1.3.3 -* Thu Feb 2 2006 Jean-Francois Dockes 1.2.2-1 +* Thu Feb 2 2006 Jean-Francois Dockes 1.2.2-1 - Update to release 1.2.2 -* Thu Jan 10 2006 Jean-Francois Dockes 1.1.0-1 +* Thu Jan 10 2006 Jean-Francois Dockes 1.1.0-1 - Initial packaging diff --git a/packaging/rpm/recollfedora.spec b/packaging/rpm/recollfedora.spec index 43af39cb..2458f776 100644 --- a/packaging/rpm/recollfedora.spec +++ b/packaging/rpm/recollfedora.spec @@ -1,6 +1,6 @@ Name: recoll Version: 1.13.01 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Desktop full text search tool with a qt gui Group: Applications/Databases @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Not sure how easy it is to find a xapian-core rpm. Will be easier to # build by hand for many. Run time uses a static link to xapian, doesnt # depend on libxapian.so -BuildRequires: qt-devel xapian-core-devel zlib-devel +BuildRequires: qt-devel xapian-core-devel zlib-devel desktop-file-utils Requires: qt xapian-core-libs zlib %description @@ -31,57 +31,66 @@ export QMAKE make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%makeinstall +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +desktop-file-install --delete-original \ + --dir=%{buildroot}/%{_datadir}/applications \ + %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop + + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/%{name} -%{_datadir}/applications/recoll-searchgui.desktop -%{_datadir}/icons/hicolor/48x48/apps/recoll.png +%{_datadir}/applications/%{name}-searchgui.desktop +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_mandir}/man1/recoll* %{_mandir}/man5/recoll* %doc %changelog -* Sun Jan 10 2010 Jean-Francois Dockes 1.13.01-2 +* Mon Jan 12 2010 Terry Duell 1.13.01-3 +- rpm spec file updated to fix Fedora desktop-file-install and install icon +* Sun Jan 10 2010 Jean-Francois Dockes 1.13.01-2 - Rpm Spec file updated for recent fedoras: depend on xapian packages, use qt4 -* Thu Jan 07 2010 Jean-Francois Dockes 1.13.01-1 +* Thu Jan 07 2010 Jean-Francois Dockes 1.13.01-1 - Update to release 1.13.01 -* Thu Dec 10 2009 Jean-Francois Dockes 1.12.4-1 +* Thu Dec 10 2009 Jean-Francois Dockes 1.12.4-1 - Update to release 1.12.4 -* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 +* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 - Update to release 1.12.0 -* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 +* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 - Update to release 1.11.0 -* Fri Sep 12 2008 Jean-Francois Dockes 1.10.6-1 +* Fri Sep 12 2008 Jean-Francois Dockes 1.10.6-1 - Update to release 1.10.6 -* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 +* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 - Update to release 1.10.2 -* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 +* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 - Update to release 1.10.1 -* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 +* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 - Update to release 1.10.0 -* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 +* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 - Update to release 1.9.0 -* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 +* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 - Update to release 1.8.1 -* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 +* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 - Update to release 1.7.5 -* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 +* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 - Update to release 1.7.3 -* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 +* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 - Update to release 1.6.0 -* Mon Nov 20 2006 Jean-Francois Dockes 1.5.11-1 +* Mon Nov 20 2006 Jean-Francois Dockes 1.5.11-1 - Update to release 1.5.11 -* Mon Oct 2 2006 Jean-Francois Dockes 1.5.2-1 +* Mon Oct 2 2006 Jean-Francois Dockes 1.5.2-1 - Update to release 1.5.2 -* Fri Mar 31 2006 Jean-Francois Dockes 1.3.2-1 +* Fri Mar 31 2006 Jean-Francois Dockes 1.3.2-1 - Update to release 1.3.1 -* Wed Feb 1 2006 Jean-Francois Dockes 1.2.0-1 +* Wed Feb 1 2006 Jean-Francois Dockes 1.2.0-1 - Initial packaging diff --git a/packaging/rpm/recollfedora10.spec b/packaging/rpm/recollfedora10.spec index 8a6d9ec9..b3e5fa07 100644 --- a/packaging/rpm/recollfedora10.spec +++ b/packaging/rpm/recollfedora10.spec @@ -48,33 +48,33 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 +* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 - Update to release 1.12.0 -* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 +* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 - Update to release 1.11.0 -* Fri Sep 12 2008 Jean-Francois Dockes 1.10.6-1 +* Fri Sep 12 2008 Jean-Francois Dockes 1.10.6-1 - Update to release 1.10.6 -* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 +* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 - Update to release 1.10.2 -* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 +* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 - Update to release 1.10.1 -* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 +* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 - Update to release 1.10.0 -* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 +* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 - Update to release 1.9.0 -* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 +* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 - Update to release 1.8.1 -* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 +* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 - Update to release 1.7.5 -* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 +* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 - Update to release 1.7.3 -* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 +* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 - Update to release 1.6.0 -* Mon Nov 20 2006 Jean-Francois Dockes 1.5.11-1 +* Mon Nov 20 2006 Jean-Francois Dockes 1.5.11-1 - Update to release 1.5.11 -* Mon Oct 2 2006 Jean-Francois Dockes 1.5.2-1 +* Mon Oct 2 2006 Jean-Francois Dockes 1.5.2-1 - Update to release 1.5.2 -* Fri Mar 31 2006 Jean-Francois Dockes 1.3.2-1 +* Fri Mar 31 2006 Jean-Francois Dockes 1.3.2-1 - Update to release 1.3.1 -* Wed Feb 1 2006 Jean-Francois Dockes 1.2.0-1 +* Wed Feb 1 2006 Jean-Francois Dockes 1.2.0-1 - Initial packaging diff --git a/packaging/rpm/recollmdk.spec b/packaging/rpm/recollmdk.spec index 15fe2374..8cea191c 100644 --- a/packaging/rpm/recollmdk.spec +++ b/packaging/rpm/recollmdk.spec @@ -59,37 +59,37 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------------- %changelog -* Mon Oct 19 2009 Jean-Francois Dockes 1.12.2-1 +* Mon Oct 19 2009 Jean-Francois Dockes 1.12.2-1 - Update to release 1.12.2 -* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 +* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-1 - Update to release 1.12.0 -* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 +* Mon Oct 13 2008 Jean-Francois Dockes 1.11.0-1 - Update to release 1.11.0 -* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 +* Thu May 27 2008 Jean-Francois Dockes 1.10.2-1 - Update to release 1.10.2 -* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 +* Thu Jan 31 2008 Jean-Francois Dockes 1.10.1-1 - Update to release 1.10.1 -* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 +* Wed Nov 21 2007 Jean-Francois Dockes 1.10.0-1 - Update to release 1.10.0 -* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 +* Tue Sep 11 2007 Jean-Francois Dockes 1.9.0-1 - Update to release 1.9.0 -* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 +* Tue Mar 6 2007 Jean-Francois Dockes 1.8.1-1 - Update to release 1.8.1 -* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 +* Mon Jan 15 2007 Jean-Francois Dockes 1.7.5-1 - Update to release 1.7.5 -* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 +* Mon Jan 08 2007 Jean-Francois Dockes 1.7.3-1 - Update to release 1.7.3 -* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 +* Tue Nov 28 2006 Jean-Francois Dockes 1.6.1-1 - Update to release 1.6.1 -* Mon Nov 20 2006 Jean-Francois Dockes 1.5.11-1 +* Mon Nov 20 2006 Jean-Francois Dockes 1.5.11-1 - Update to release 1.5.11 -* Mon Oct 2 2006 Jean-Francois Dockes 1.5.2-1 +* Mon Oct 2 2006 Jean-Francois Dockes 1.5.2-1 - Update to release 1.5.2 -* Sun May 7 2006 Jean-Francois Dockes 1.4.3-1 +* Sun May 7 2006 Jean-Francois Dockes 1.4.3-1 - Update to release 1.4.3 -* Fri Mar 31 2006 Jean-Francois Dockes 1.3.3-1 +* Fri Mar 31 2006 Jean-Francois Dockes 1.3.3-1 - Update to release 1.3.3 -* Thu Feb 2 2006 Jean-Francois Dockes 1.2.2-1 +* Thu Feb 2 2006 Jean-Francois Dockes 1.2.2-1 - Update to release 1.2.2 -* Thu Jan 10 2006 Jean-Francois Dockes 1.1.0-1 +* Thu Jan 10 2006 Jean-Francois Dockes 1.1.0-1 - Initial packaging