X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=idzebra.spec;h=5185134444dbf89c5fcfa07fd656ed2f28806754;hp=6af2c7844c0dd94406a1cc24e08b5ccee4e652ee;hb=732870c555c7d32c5d2b6a4914c6fa7232eb26b2;hpb=e6c40598be6d20486d0c17fa115af66b9ee54d07

diff --git a/idzebra.spec b/idzebra.spec
index 6af2c78..5185134 100644
--- a/idzebra.spec
+++ b/idzebra.spec
@@ -1,5 +1,5 @@
 Name: idzebra-2.0
-Version: 2.0.46
+Version: 2.0.50
 Release: 1indexdata
 Requires: lib%{name}-modules = %{version}
 License: GPL
@@ -9,7 +9,8 @@ Source: idzebra-%{version}.tar.gz
 BuildRoot: %{_tmppath}/idzebra-%{version}-root
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.dk/zebra/
-BuildRequires: libyaz4-devel expat-devel bzip2-devel tcl zlib-devel
+BuildRequires: libyaz4-devel >= 4.2.0
+BuildRequires: expat-devel, bzip2-devel, tcl, zlib-devel
 Summary: High-performance, structured text indexing and retrival engine.
 
 %description
@@ -47,18 +48,20 @@ Development libraries for the Zebra search engine.
 %build
 
 CFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=/usr --enable-shared --with-yaz=/usr/bin
+ ./configure --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir}\
+	--enable-shared --with-yaz=/usr/bin
 make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
-make prefix=${RPM_BUILD_ROOT}/usr mandir=${RPM_BUILD_ROOT}/usr/share/man install
-rm ${RPM_BUILD_ROOT}/usr/lib/*.la
-rm ${RPM_BUILD_ROOT}/usr/bin/zebraidx
-rm ${RPM_BUILD_ROOT}/usr/share/man/man1/zebraidx.*
-rm ${RPM_BUILD_ROOT}/usr/bin/zebrasrv
-rm ${RPM_BUILD_ROOT}/usr/share/man/man8/zebrasrv.*
-rm ${RPM_BUILD_ROOT}/usr/share/man/man1/idzebra-config.*
+make prefix=${RPM_BUILD_ROOT}/usr mandir=${RPM_BUILD_ROOT}/%{_mandir} \
+        libdir=${RPM_BUILD_ROOT}/%{_libdir} install
+rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
+rm ${RPM_BUILD_ROOT}/%{_bindir}/zebraidx
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/zebraidx.*
+rm ${RPM_BUILD_ROOT}/%{_bindir}/zebrasrv
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man8/zebrasrv.*
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/idzebra-config.*
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}
@@ -67,23 +70,26 @@ rm -fr ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %doc README LICENSE.zebra NEWS
 %config /usr/share/idzebra-2.0/tab
-/usr/bin/zebrasrv-*
-/usr/bin/zebraidx-*
+%{_bindir}/zebrasrv-*
+%{_bindir}/zebraidx-*
+%{_bindir}/idzebra-abs2dom*
 /usr/share/doc/idzebra-2.0
-/usr/share/man/*/zebraidx-*
-/usr/share/man/*/zebrasrv-*
+%{_mandir}/*/zebraidx-*
+%{_mandir}/*/zebrasrv-*
+%{_mandir}/*/idzebra-abs2dom*
 /usr/share/idzebra-2.0-examples
+
 %files -n lib%{name}
-/usr/lib/*.so.*
+%{_libdir}/*.so.*
 
 %files -n lib%{name}-modules
-/usr/lib/idzebra-2.0/modules/*
+%{_libdir}/idzebra-2.0/modules/*
 
 %files -n lib%{name}-devel
-/usr/bin/idzebra-config-*
-/usr/include/idzebra-2.0/*
-/usr/lib/*.so
-/usr/lib/*.a
-/usr/share/man/*/idzebra-config-*
+%{_bindir}/idzebra-config-*
+%{_includedir}/idzebra-2.0
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_mandir}/*/idzebra-config-*
 /usr/share/aclocal/*.m4