move librecoll to lib/recoll

packaging/rpm/recoll.spec

@@ -1,5 +1,5 @@
 %define name recoll
-%define version 1.17.2
+%define version 3152
 %define release 0
 
 Name:           %{name}
@@ -40,6 +40,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+%{__chmod} 0755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/lib%{name}.so.%{version}
 
 # ---------------------------------------------------------------------------
 
@@ -52,6 +53,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{python_sitearch}/
+%{_libdir}/%{name}
+%{_libdir}/%{name}/lib%{name}.so.%{version}
 %{_datadir}/%{name}
 %{_datadir}/applications/recoll-searchgui.desktop
 %{_datadir}/icons/hicolor/48x48/apps/recoll.png

packaging/rpm/recollfedora10+.spec

@@ -35,7 +35,7 @@ export QMAKE=qmake-qt4
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p'
-%{__chmod} 0755 %{buildroot}/%{_libdir}/lib%{name}.so.%{version}
+%{__chmod} 0755 %{buildroot}/%{_libdir}/%{name}/lib%{name}.so.%{version}
 
 desktop-file-install --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
@@ -72,7 +72,8 @@ exit 0
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
 %{_bindir}/%{name}index
-%{_libdir}/lib%{name}.so.%{version}
+%{_libdir}/%{name}
+%{_libdir}/%{name}/lib%{name}.so.%{version}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}-searchgui.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png

src/Makefile.in

@@ -17,7 +17,7 @@ all: mk/sysconf
 	${MAKE} -C index recollindex
 	@NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
 	@NOQTMAKE@${MAKE} -C $(QTGUI) depth=..
-	@NOPYTHON@${MAKE} -C python/recoll
+	@NOPYTHON@${MAKE} -C python/recoll libdir=$(libdir)
 	${MAKE} -C query recollq xadump
 
 mk/sysconf:

src/kde/kioslave/kio_recoll/CMakeLists.txt

@@ -54,7 +54,7 @@ add_custom_target(rcllib
 )
 add_dependencies(kio_recoll rcllib)
 
-target_link_libraries(kio_recoll recoll xapian z ${EXTRA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(kio_recoll recoll ${EXTRA_LIBS} ${KDE4_KIO_LIBS})
 
 install(TARGETS kio_recoll DESTINATION ${PLUGIN_INSTALL_DIR})
 

src/mk/commondefs

@@ -15,7 +15,7 @@ COMMONCXXFLAGS = -I. \
 # the sys file or localdefs
 SYSPICFLAGS = -fPIC -DPIC
 
-LIBRECOLL = -L $(depth)/lib -lrecoll -Wl,-rpath=$(libdir)
+LIBRECOLL = -L $(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll
 
 RANLIB = test -f
 AR=ar

src/python/recoll/Makefile

@@ -1,5 +1,6 @@
 all:
-	python setup.py build
+	echo libdir: $(libdir)
+	libdir=$(libdir) python setup.py build
 install:
 	sudo python setup.py install
 clean:

src/python/recoll/setup.py.in

@@ -5,18 +5,9 @@ import sys
 sysname = os.uname()[0]
 top = os.path.join('..', '..')
 
-libiconv = "@LIBICONV@"
+library_dirs = [os.path.join(top, 'lib')]
-
+libraries = ['recoll']
-if libiconv.find("-liconv") != -1:
+runtime_library_dirs = [os.path.join(os.environ['libdir'], 'recoll')]
-    libs = ['recoll', 'xapian', 'iconv']
-else:
-    libs = ['recoll', 'xapian']
-
-libxapiandir="@LIBXAPIANDIR@"
-if libxapiandir != "":
-    libdirs = [os.path.join(top, 'lib'), libxapiandir, '/usr/local/lib']
-else:
-    libdirs = [os.path.join(top, 'lib'), '/usr/local/lib']
 
 # Verify that the Recoll library was compiled with the PIC options
 localdefs = os.path.join(top, 'mk', 'localdefs')
@@ -48,9 +39,9 @@ module1 = Extension('recoll',
                                     os.path.join(top, 'query'), 
                                     os.path.join(top, 'unac')
                                     ],
-                    libraries = libs,
+                    libraries = libraries,
-                    library_dirs = libdirs,
+                    library_dirs = library_dirs,
-                    runtime_library_dirs = libdirs,
+                    runtime_library_dirs = runtime_library_dirs,
                     sources = ['pyrecoll.cpp'])
 
 module2 = Extension('rclextract',
@@ -65,9 +56,9 @@ module2 = Extension('rclextract',
                                     os.path.join(top, 'internfile'), 
                                     os.path.join(top, 'rcldb'), 
                                     ],
-                    libraries = libs,
+                    libraries = libraries,
-                    library_dirs = libdirs,
+                    library_dirs = library_dirs,
-                    runtime_library_dirs = libdirs,
+                    runtime_library_dirs = runtime_library_dirs,
                     sources = ['pyrclextract.cpp'])
 
 setup (name = 'Recoll',

src/qtgui/recoll.pro.in

@@ -82,7 +82,7 @@ unix {
   OBJECTS_DIR = .obj
   # Expanding prefix here is not good as it means that it can't be
   # redefined at make time.
-  LIBS += $(BSTATIC) -L../lib -lrecoll -Wl,-rpath=@prefix@/lib \
+  LIBS += $(BSTATIC) -L../lib -lrecoll -Wl,-rpath=@prefix@/lib/recoll \
        @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
        @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
 

src/recollinstall.in

@@ -69,6 +69,7 @@ test -x $TESTPROG || fatal "$TESTPROG does not exist." \
 for d in \
     ${bindir} \
     ${libdir} \
+    ${libdir}/recoll \
     ${mandir}/man1 \
     ${mandir}/man5 \
     ${datadir}/icons \
@@ -116,7 +117,7 @@ ${INSTALL} -m 0444 doc/man/recoll.conf.5  ${mandir}/man5/
 ${INSTALL} -m 0755 index/recollindex ${bindir} || exit 1
 ${STRIP} ${bindir}/recollindex
 
-${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} ${libdir} || exit 1
+${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} ${libdir}/recoll/ || exit 1
 
 ${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1
 for f in rclexecm.py rcllatinstops.zip;do