tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.23.1 packaging

Browse Source
This commit is contained in:
Jean-Francois Dockes 2017-04-09 04:10:01 +02:00
parent 06e8424048
commit 638214f513
5 changed files with 148 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packaging/debian/buildppa.sh
View File

@ -4,7 +4,7 @@
# For the kio: (and kdesdk?) # For the kio: (and kdesdk?)
# sudo apt-get install pkg-kde-tools cdbs # sudo apt-get install pkg-kde-tools cdbs
RCLVERS=1.23.0 RCLVERS=1.23.1
LENSVERS=1.19.10.3543 LENSVERS=1.19.10.3543
SCOPEVERS=1.20.2.4 SCOPEVERS=1.20.2.4
PPAVERS=1 PPAVERS=1
@ -43,8 +43,10 @@ check_recoll_orig()
####### QT ####### QT
debdir=debian debdir=debian
# Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir. # Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
series="trusty xenial yakkety" # No new releases for trusty either because of risk of kio compat (kio
#series= # wont build)
series="xenial yakkety zesty"
#series=zesty
if test "X$series" != X ; then if test "X$series" != X ; then
check_recoll_orig check_recoll_orig
@ -75,8 +77,8 @@ done
### KIO. Does not build on trusty from recoll 1.23 because of the need ### KIO. Does not build on trusty from recoll 1.23 because of the need
### for c++11 ### for c++11
series="xenial yakkety" #series="xenial yakkety zesty"
#series=xenial series=
debdir=debiankio debdir=debiankio
topdir=kio-recoll-${RCLVERS} topdir=kio-recoll-${RCLVERS}

6
packaging/debian/debian/changelog
View File

@ -1,3 +1,9 @@
recoll (1.23.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Small fixes to kio build
-- Jean-Francois Dockes <jf@dockes.org> Tue, 28 Mar 2017 08:48:00 +0100
recoll (1.23.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low recoll (1.23.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Misc changes, mostly internal * Misc changes, mostly internal

6
packaging/debian/debiankio/changelog
View File

@ -1,3 +1,9 @@
kio-recoll (1.23.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Small fixes to kio build
-- Jean-Francois Dockes <jf@dockes.org> Tue, 28 Mar 2017 08:48:00 +0100
kio-recoll (1.23.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low kio-recoll (1.23.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Misc changes, mostly internal * Misc changes, mostly internal

2
packaging/debian/debiankio/patches/series
View File

@ -1 +1 @@
kioslave.patch

149
packaging/rpm/recoll.spec
View File

@ -1,18 +1,24 @@
Summary: Desktop full text search tool with Qt GUI Summary: Desktop full text search tool with Qt GUI
Name: recoll Name: recoll
Version: 1.20.6 Version: 1.23.1
Release: 1%{?dist} Release: 1%{?dist}
Group: Applications/Databases Group: Applications/Databases
License: GPLv2+ License: GPLv2+
URL: http://www.lesbonscomptes.com/recoll/ URL: http://www.lesbonscomptes.com/recoll/
Source0: http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz Source0: http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
BuildRequires: qt-devel Source10: qmake-qt5.sh
BuildRequires: qtwebkit-devel
BuildRequires: python-devel
BuildRequires: zlib-devel
BuildRequires: aspell-devel BuildRequires: aspell-devel
BuildRequires: xapian-core-devel BuildRequires: bison
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# kio
BuildRequires: kdelibs4-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtwebkit-devel
BuildRequires: extra-cmake-modules
BuildRequires: kf5-kio-devel
BuildRequires: python2-devel
BuildRequires: xapian-core-devel
BuildRequires: zlib-devel
Requires: xdg-utils Requires: xdg-utils
%description %description
@ -20,15 +26,29 @@ Recoll is a personal full text search package for Linux, FreeBSD and
other Unix systems. It is based on a very strong back end (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 which it provides an easy to use, feature-rich, easy administration
interface. interface.
%global __provides_exclude_from ^%{_libdir}/recoll/librecoll\\.so.*$
%global __requires_exclude ^librecoll\\.so.*$ %package kio
Summary: KIO support for recoll
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
%description kio
The recoll KIO slave allows performing a recoll search by entering an
appropriate URL in a KDE open dialog, or with an HTML-based interface
displayed in Konqueror.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
chmod 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
%build %build
export QMAKE=qmake-qt4 CFLAGS="%{optflags}"; export CFLAGS
CXXFLAGS="%{optflags}"; export CXXFLAGS
LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
# force use of custom/local qmake, to inject proper build flags (above)
install -m755 -D %{SOURCE10} qmake-qt5.sh
export QMAKE=qmake-qt5
%configure %configure
make %{?_smp_mflags} make %{?_smp_mflags}
@ -42,9 +62,27 @@ desktop-file-install --delete-original \
# use /usr/bin/xdg-open # use /usr/bin/xdg-open
rm -f %{buildroot}/usr/share/recoll/filters/xdg-open rm -f %{buildroot}/usr/share/recoll/filters/xdg-open
# fix perms # kio_recoll -kde5
chmod 0755 %{buildroot}/usr/share/recoll/filters/rclexecm.py (
chmod 0755 %{buildroot}%{_libdir}/recoll/librecoll.so.* mkdir kde/kioslave/kio_recoll/build && pushd kde/kioslave/kio_recoll/build
%cmake ..
make %{?_smp_mflags} VERBOSE=1
make install DESTDIR=%{buildroot}
popd
)
# kio_recoll -kde4
(
mkdir kde/kioslave/kio_recoll-kde4/build && \
pushd kde/kioslave/kio_recoll-kde4/build
%cmake ..
make %{?_smp_mflags} VERBOSE=1
make install DESTDIR=%{buildroot}
popd
)
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%post %post
touch --no-create %{_datadir}/icons/hicolor touch --no-create %{_datadir}/icons/hicolor
@ -54,6 +92,7 @@ fi
if [ -x %{_bindir}/update-desktop-database ] ; then if [ -x %{_bindir}/update-desktop-database ] ; then
%{_bindir}/update-desktop-database &> /dev/null %{_bindir}/update-desktop-database &> /dev/null
fi fi
/sbin/ldconfig
exit 0 exit 0
%postun %postun
@ -64,10 +103,13 @@ fi
if [ -x %{_bindir}/update-desktop-database ] ; then if [ -x %{_bindir}/update-desktop-database ] ; then
%{_bindir}/update-desktop-database &> /dev/null %{_bindir}/update-desktop-database &> /dev/null
fi fi
/sbin/ldconfig
exit 0 exit 0
%files %files
%doc COPYING ChangeLog README %license COPYING
%doc ChangeLog README
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%{_bindir}/%{name} %{_bindir}/%{name}
%{_bindir}/%{name}index %{_bindir}/%{name}index
%{_datadir}/%{name} %{_datadir}/%{name}
@ -79,18 +121,84 @@ exit 0
%{python_sitearch}/recoll %{python_sitearch}/recoll
%{python_sitearch}/Recoll*.egg-info %{python_sitearch}/Recoll*.egg-info
%{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}.1*
%{_mandir}/man1/recollq.1* %{_mandir}/man1/%{name}q.1*
%{_mandir}/man1/%{name}index.1* %{_mandir}/man1/%{name}index.1*
%{_mandir}/man5/%{name}.conf.5* %{_mandir}/man5/%{name}.conf.5*
%changelog %files kio
* Sat Apr 25 2015 Jean-Francois Dockes <jf@dockes.org> - 1.20.6-1 %license COPYING
- 1.20.6 %{_libdir}/kde4/kio_recoll.so
%{_libdir}/qt5/plugins/kio_recoll.so
%{_datadir}/kde4/apps/kio_recoll/
%{_datadir}/kde4/services/recoll.protocol
%{_datadir}/kde4/services/recollf.protocol
%{_datadir}/kio_recoll/help.html
%{_datadir}/kio_recoll/welcome.html
%{_datadir}/kservices5/recoll.protocol
%{_datadir}/kservices5/recollf.protocol
* Fri Dec 19 2014 Jean-Francois Dockes <jf@dockes.org> - 1.20.1-1 %changelog
* Sat Mar 11 2017 Terje Rosten <terje.rosten@ntnu.no> - 1.23.0-1
- 1.23.0
* Sat Feb 18 2017 Terje Rosten <terje.rosten@ntnu.no> - 1.22.4-1
- 1.22.4
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Dec 26 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.22.3-2
- Rebuild (xapian 1.4)
* Sun Sep 18 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.22.3-1
- 1.22.3
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.21.7-2
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Fri May 13 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.21.7-1
- 1.21.7
* Wed Apr 06 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.21.6-1
- 1.21.6
- Nice fixes from Jean-Francois Dockes (upstream) merged, thanks!
* Sat Feb 06 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.21.5-1
- 1.21.5
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Jan 18 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.21.4-1
- 1.21.4
* Sat Oct 31 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.21.3-1
- 1.21.3
* Sat Oct 03 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.21.2-1
- 1.21.2
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.20.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Tue May 05 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.6-1
- 1.20.6
- Fixes bz#1218161 and bz#1204464
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.20.5-3
- Rebuilt for GCC 5 C++11 ABI change
* Sat Apr 11 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.5-2
- Add KIO subpackage
* Tue Apr 07 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.5-1
- 1.20.5
- Include kio support (bz#1203257)
* Sat Jan 10 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.1-1
- 1.20.1 - 1.20.1
* Sun Nov 09 2014 Jean-Francois Dockes <jf@dockes.org> - 1.19.14p2-1 * Sun Nov 09 2014 Terje Rosten <terje.rosten@ntnu.no> - 1.19.14p2-1
- 1.19.14p2 - 1.19.14p2
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.13-3 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.13-3
@ -221,4 +329,3 @@ exit 0
* Wed Feb 1 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.0-1 * Wed Feb 1 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.0-1
- initial packaging - initial packaging