diff --git a/packaging/rpm/recollfedora10+.spec b/packaging/rpm/recollfedora10+.spec index be9f5b47..5cd14785 100644 --- a/packaging/rpm/recollfedora10+.spec +++ b/packaging/rpm/recollfedora10+.spec @@ -1,6 +1,6 @@ Summary: Desktop full text search tool with Qt GUI Name: recoll -Version: 1.17.2 +Version: 3150 Release: 1%{?dist} Group: Applications/Databases License: GPLv2+ @@ -71,17 +71,24 @@ exit 0 %doc COPYING ChangeLog README %{_bindir}/%{name} %{_bindir}/%{name}index +%{_libdir}/lib%{name}.so.%{version} %{_datadir}/%{name} %{_datadir}/applications/%{name}-searchgui.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/pixmaps/%{name}.png %{python_sitearch}/Recoll*.egg-info -%{python_sitearch}/recoll.so +%{python_sitearch}/recoll/recoll.so +%{python_sitearch}/recoll/rclextract.so +%{python_sitearch}/recoll/__init__.py +%{python_sitearch}/recoll/__init__.pyc %{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}index.1* %{_mandir}/man5/%{name}.conf.5* %changelog +* Sat Dec 29 2012 J.F. Dockes - 3149 1.19.0 snap +- Snapshot for packaging tests + * Thu May 17 2012 J.F. Dockes - 1.17.2-1 - 1.17.2 diff --git a/src/Makefile.in b/src/Makefile.in index 00623ba3..6b6da5e1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -4,6 +4,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ +libdir = @libdir@ datadir = @datadir@ datarootdir = @datarootdir@ mandir = @mandir@ @@ -77,7 +78,7 @@ maintainer-clean: distclean # override the computed defaults. install: all DESTDIR=${DESTDIR} bindir=${bindir} datadir=${datadir} \ - mandir=${mandir} \ - /bin/sh ./recollinstall ${prefix} + libdir=${libdir} mandir=${mandir} \ + /bin/sh ./recollinstall ${prefix} .PHONY: all static clean distclean install diff --git a/src/python/recoll/pyrecoll.cpp b/src/python/recoll/pyrecoll.cpp index c7667a76..0a56d605 100644 --- a/src/python/recoll/pyrecoll.cpp +++ b/src/python/recoll/pyrecoll.cpp @@ -1837,22 +1837,22 @@ initrecoll(void) if (PyType_Ready(&recoll_DbType) < 0) return; - Py_INCREF(&recoll_DbType); + Py_INCREF((PyObject*)&recoll_DbType); PyModule_AddObject(m, "Db", (PyObject *)&recoll_DbType); if (PyType_Ready(&recoll_QueryType) < 0) return; - Py_INCREF(&recoll_QueryType); + Py_INCREF((PyObject*)&recoll_QueryType); PyModule_AddObject(m, "Query", (PyObject *)&recoll_QueryType); if (PyType_Ready(&recoll_DocType) < 0) return; - Py_INCREF(&recoll_DocType); + Py_INCREF((PyObject*)&recoll_DocType); PyModule_AddObject(m, "Doc", (PyObject *)&recoll_DocType); if (PyType_Ready(&recoll_SearchDataType) < 0) return; - Py_INCREF(&recoll_SearchDataType); + Py_INCREF((PyObject*)&recoll_SearchDataType); PyModule_AddObject(m, "SearchData", (PyObject *)&recoll_SearchDataType); PyModule_AddStringConstant(m, "__doc__", pyrecoll_doc_string); diff --git a/src/recollinstall.in b/src/recollinstall.in index 90c428f6..677930e3 100755 --- a/src/recollinstall.in +++ b/src/recollinstall.in @@ -40,6 +40,7 @@ ROOTFORPYTHON="" if test -n "$DESTDIR" ; then PREFIX=$DESTDIR/$PREFIX bindir=$DESTDIR/$bindir + libdir=$DESTDIR/$libdir datadir=$DESTDIR/$datadir mandir=$DESTDIR/$mandir ROOTFORPYTHON="--root=${DESTDIR}" @@ -67,6 +68,7 @@ test -x $TESTPROG || fatal "$TESTPROG does not exist." \ for d in \ ${bindir} \ + ${libdir} \ ${mandir}/man1 \ ${mandir}/man5 \ ${datadir}/icons \