diff --git a/packaging/rpm/recollfedora.spec b/packaging/rpm/recollfedora.spec index 859201f9..623d4331 100644 --- a/packaging/rpm/recollfedora.spec +++ b/packaging/rpm/recollfedora.spec @@ -1,19 +1,19 @@ Name: recoll -Version: 1.13.02 +Version: 1.13.04 Release: 1%{?dist} Summary: Desktop full text search tool with a qt gui Group: Applications/Databases License: GPL URL: http://www.recoll.org/ -Source0: http://www.recoll.org/recoll-1.13.02.tar.gz +Source0: http://www.recoll.org/recoll-1.13.04.tar.gz 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 desktop-file-utils -Requires: qt xapian-core-libs zlib +BuildRequires: qt-devel +Requires: qt %description Recoll is a personal full text search package for Linux, FreeBSD and @@ -25,47 +25,36 @@ interface. %setup -q %build -QMAKE=qmake-qt4 -export QMAKE +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh %configure -make %{?_smp_mflags} +make %{?_smp_mflags} static %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} - -desktop-file-install --delete-original \ - --dir=%{buildroot}/%{_datadir}/applications \ - %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop - - +rm -rf $RPM_BUILD_ROOT +%makeinstall %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/%{name} %{_datadir}/applications/%{name}-searchgui.desktop -%{_datadir}/pixmaps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/recoll* %{_mandir}/man5/recoll* %doc %changelog -* 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 -* 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 Apr 14 2010 Jean-Francois Dockes 1.13.04-1 +- Update to release 1.13.04 * 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 -- Update to release 1.12.4 +* Wed Oct 28 2009 Jean-Francois Dockes 1.12.3-1 +- Update to release 1.12.3 * 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 diff --git a/packaging/rpm/recollqt4xapdynfc12+.spec b/packaging/rpm/recollqt4xapdynfc12+.spec index 101e9266..064197d0 100644 --- a/packaging/rpm/recollqt4xapdynfc12+.spec +++ b/packaging/rpm/recollqt4xapdynfc12+.spec @@ -23,65 +23,76 @@ interface. %prep %setup -q -QMAKE=qmake-qt4 -export QMAKE + %build +QMAKE=qmake-qt4 +export QMAKE %configure -make %{?_smp_mflags} +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}/pixmaps/recoll.png +%{_datadir}/applications/%{name}-searchgui.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/recoll* %{_mandir}/man5/recoll* %doc %changelog -* Thu Apr 14 2010 Jean-Francois Dockes 1.13.04-1 -- Update to release 1.13.04 -* Thu Jan 07 2010 Jean-Francois Dockes 1.13.01-1 +* 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 +* 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 - Update to release 1.13.01 -* Wed Oct 28 2009 Jean-Francois Dockes 1.12.3-1 -- Update to release 1.12.3 -* Thu Jan 29 2009 Jean-Francois Dockes 1.12.0-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 - 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