release 1.17.2 packaging and doc touchups

This commit is contained in:
Jean-Francois Dockes
2012-05-17 16:15:49 +02:00
parent 6ee73ecd05
commit c22170a1dd
9 changed files with 221 additions and 129 deletions
+3 -1
View File
@@ -1,5 +1,5 @@
%define name recoll
%define version 1.17.0
%define version 1.17.2
%define release 0
Name: %{name}
@@ -69,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
# ---------------------------------------------------------------------------
%changelog
* Thu May 17 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.2-0
- Update to release 1.17.2
* Sun Mar 18 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.0-0
- Update to release 1.17.0
* Mon Nov 07 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.2-0
+140 -76
View File
@@ -1,112 +1,176 @@
Summary: Desktop full text search tool with Qt GUI
Name: recoll
Version: 1.17.0
Version: 1.17.2
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.17.0.tar.gz
BuildRequires: qt-devel qt-webkit-devel xapian-core-devel zlib-devel desktop-file-utils
License: GPLv2+
URL: http://www.lesbonscomptes.com/recoll/
Source0: http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
BuildRequires: qt-devel
BuildRequires: qtwebkit-devel
BuildRequires: python-devel
BuildRequires: zlib-devel
BuildRequires: aspell-devel
BuildRequires: xapian-core-devel
BuildRequires: desktop-file-utils
Requires: xdg-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Recoll is a personal full text search package for Linux, FreeBSD and
other Unix systems. It is based on a very strong backend (Xapian), for
other Unix systems. It is based on a very strong back end (Xapian), for
which it provides an easy to use, feature-rich, easy administration
interface.
%prep
%setup -q
# remove execute bit
%{__chmod} 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
%build
QMAKE=qmake-qt4
export QMAKE
export QMAKE=qmake-qt4
%configure
# No smpflags as the builds fails for some reason if -j is used.
make
%{__make} %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p'
desktop-file-install --delete-original \
--dir=%{buildroot}/%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop
# use /usr/bin/xdg-open
%{__rm} -f %{buildroot}/usr/share/recoll/filters/xdg-open
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
if [ -x %{_bindir}/update-desktop-database ] ; then
%{_bindir}/update-desktop-database &> /dev/null
fi
exit 0
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
if [ -x %{_bindir}/update-desktop-database ] ; then
%{_bindir}/update-desktop-database &> /dev/null
fi
exit 0
%clean
rm -rf %{buildroot}
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/*
%defattr(-, root, root, -)
%doc COPYING ChangeLog README
%{_bindir}/%{name}
%{_bindir}/%{name}index
%{_datadir}/%{name}
%{_datadir}/applications/%{name}-searchgui.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.png
%{_mandir}/man1/recoll*
%{_mandir}/man5/recoll*
%doc
%{python_sitearch}/Recoll*.egg-info
%{python_sitearch}/recoll.so
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/%{name}index.1*
%{_mandir}/man5/%{name}.conf.5*
%changelog
* Sun Mar 18 2012 J.F. Dockes <jfd@recoll.org> 1.17.9-1
- updated to release 1.16.1
* Wed Sep 28 2011 J.F. Dockes <jfd@recoll.org> 1.16.1-1
- updated to release 1.16.1
* Wed Sep 21 2011 J.F. Dockes <jfd@recoll.org> 1.16.0-1
- updated to release 1.16.0
* Mon May 02 2011 J.F. Dockes <jfd@recoll.org> 1.15.8-1
- updated to release 1.15.8
* Fri Mar 15 2011 J.F. Dockes <jfd@recoll.org> 1.15.5-1
- updated to release 1.15.5
* Thu Feb 15 2011 J.F. Dockes <jfd@recoll.org> 1.15.2-1
- updated to release 1.15.2
* Wed Feb 02 2011 J.F. Dockes <jfd@recoll.org> 1.15.0-1
- updated to release 1.15.0
* Mon Sep 13 2010 J.F. Dockes <jfd@recoll.org> 1.14.0-1
- updated to release 1.14.0
* Sun May 9 2010 J.F. Dockes <jfd@recoll.org> 1.13.04-2
- Bumped the release number to issue new rpms for fc10
* Sun May 9 2010 J.F. Dockes 1.13.04
- spec file updated to recoll release 1.13.04.
* Thu May 17 2012 J.F. Dockes <jf@dockes.org> - 1.17.2-1
- 1.17.2
* Sat Mar 31 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17.1-1
- 1.17.1
* Sun Mar 25 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17-1
- 1.17
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.2-3
- Rebuilt for c++ ABI breakage
* Wed Feb 15 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-2
- Add patch to build with gcc 4.7
* Wed Feb 01 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-1
- 1.16.2
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Oct 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-2
- Add patch to fix crash (bz #747472)
* Tue Oct 18 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-1
- 1.16.1
* Tue May 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-2
- add patch from upstream to fix crash.
* Sun May 08 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-1
- 1.15.8
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.14.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Jan 28 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.14.4-1
- 1.14.4
* Mon Nov 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-2
- Add patch to fix #631704
* Sun Nov 7 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-1
- 1.14.2
* Thu Jul 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-6
- add patch to build with xapian 1.2 (from J.F. Dockes, thanks)
* Sat Jul 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-5
- use system xdg-open
- trim chagenlog
* Fri Jul 9 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-4
- fix some review comments
* Mon May 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-3
- use version macro in source url
- don't strip bins, giving non empty debuginfo package
- more explicit file listing
- try to preserve timestamps
- use proper name for spec file
- fix changelog
- license seems to be GPLv2+
- include some %%doc files
- add buildroot tag
- some source add execute bit set
- explicit enable inotify
- add aspell-devel to bulldreq
- make with _smp_mflags seems to work
- add post scripts
- add patch to build gui with correct flags (ref: 338791)
* Sun May 9 2010 J.F. Dockes <jfd@recoll.org> 1.13.04-2
- bumped the release number to issue new rpms for fc10
* Sun May 9 2010 J.F. Dockes 1.13.04
- updated to recoll release 1.13.04
* 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
* Mon Jan 12 2010 Terry Duell 1.13.01-3
- updated to fix Fedora desktop-file-install and install icon
* Sun Jan 10 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-2
- Rpm Spec file updated for recent fedoras: depend on xapian packages, use qt4
- updated for recent fedoras: depend on xapian packages, use qt4
* Thu Jan 07 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-1
- Update to release 1.13.01
* Thu Dec 10 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.4-1
- Update to release 1.12.4
* Thu Jan 29 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.0-1
- Update to release 1.12.0
* Mon Oct 13 2008 Jean-Francois Dockes <jfd@recoll.org> 1.11.0-1
- Update to release 1.11.0
* Fri Sep 12 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.6-1
- Update to release 1.10.6
* Thu May 27 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.2-1
- Update to release 1.10.2
* Thu Jan 31 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.1-1
- Update to release 1.10.1
* Wed Nov 21 2007 Jean-Francois Dockes <jfd@recoll.org> 1.10.0-1
- Update to release 1.10.0
* Tue Sep 11 2007 Jean-Francois Dockes <jfd@recoll.org> 1.9.0-1
- Update to release 1.9.0
* Tue Mar 6 2007 Jean-Francois Dockes <jfd@recoll.org> 1.8.1-1
- Update to release 1.8.1
* Mon Jan 15 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.5-1
- Update to release 1.7.5
* Mon Jan 08 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.3-1
- Update to release 1.7.3
* Tue Nov 28 2006 Jean-Francois Dockes <jfd@recoll.org> 1.6.1-1
- Update to release 1.6.0
* Mon Nov 20 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.11-1
- Update to release 1.5.11
* Mon Oct 2 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.2-1
- Update to release 1.5.2
* Fri Mar 31 2006 Jean-Francois Dockes <jfd@recoll.org> 1.3.2-1
- Update to release 1.3.1
- update to release 1.13.01
* Wed Feb 1 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.0-1
- Initial packaging
- initial packaging
+8 -4
View File
@@ -1,5 +1,5 @@
%define name recoll
%define version 1.17.0
%define version 1.17.2
%define release %mkrel 1
Name: %{name}
@@ -13,7 +13,9 @@ Group: Applications/Databases
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
License: GPL
Requires: xapian-core
BuildRequires: libqt4-devel
BuildRequires: libpython-devel
BuildRequires: libxapian-devel
%description
Recoll is a personal full text search package for Linux, FreeBSD and
@@ -55,12 +57,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}
%{_mandir}/man1/recoll*
%{_mandir}/man5/recoll*
%{python_sitearch}/Recoll*.egg-info
%{python_sitearch}/recoll.so
# ---------------------------------------------------------------------------
%changelog
* Sun Mar 18 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.0-1
- Update to release 1.17.0
* Thu May 17 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.2-1
- Update to release 1.17.2
* Mon Nov 07 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.2-1
- Update to release 1.16.2
* Wed Sep 28 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.1-1