X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=idzebra.spec;h=343baeadbe26d8971905bc5de083eaf0f08b0297;hp=f711fa77cb5946b9f7668e982f1f7cf1230aee03;hb=90d4902e0921f68842031a4aa1e743d5df06047f;hpb=ad98eebdd3fe3215105b5bfed1e556dc38cfe77c

diff --git a/idzebra.spec b/idzebra.spec
index f711fa7..343baea 100644
--- a/idzebra.spec
+++ b/idzebra.spec
@@ -1,9 +1,9 @@
-Name: idzebra-2.0
-Version: 2.0.46
+%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
+Name: idzebra
+%define namev idzebra-2.0
+Version: %{idmetaversion}
 Release: 1indexdata
-Requires: lib%{name}-modules = %{version}
 License: GPL
-Group: Applications/Databases
 Vendor: Index Data ApS <info@indexdata.dk>
 Source: idzebra-%{version}.tar.gz
 BuildRoot: %{_tmppath}/idzebra-%{version}-root
@@ -12,79 +12,95 @@ URL: http://www.indexdata.dk/zebra/
 BuildRequires: libyaz4-devel >= 4.2.0
 BuildRequires: expat-devel, bzip2-devel, tcl, zlib-devel
 Summary: High-performance, structured text indexing and retrival engine.
-
+Group: Applications/Databases
 %description
 Zebra is a high-performance, general-purpose structured text indexing
 and retrieval engine. It reads structured records in a variety of input
 formats (eg. email, XML, MARC) and allows access to them through exact
 boolean search expressions and relevance-ranked free-text queries. 
 
-%package -n lib%{name}
+%package -n %{namev}
+Summary: High-performance, structured text indexing and retrival engine.
+Group: Applications/Databases
+Requires: lib%{namev}-modules = %{version}
+%description -n %{namev}
+Zebra is a high-performance, general-purpose structured text indexing
+and retrieval engine. It reads structured records in a variety of input
+formats (eg. email, XML, MARC) and allows access to them through exact
+boolean search expressions and relevance-ranked free-text queries. 
+
+
+%package -n lib%{namev}
 Summary: Zebra libraries
 Group: Libraries
 Requires: libyaz4 bzip2-libs
-%description -n lib%{name}
+%description -n lib%{namev}
 Libraries for the Zebra search engine.
 %post -p /sbin/ldconfig 
 %postun -p /sbin/ldconfig 
 
-%package -n lib%{name}-modules
+%package -n lib%{namev}-modules
 Summary: Zebra modules
 Group: Libraries
-Requires: lib%{name} = %{version} expat tcl
-%description -n lib%{name}-modules
+Requires: lib%{namev} = %{version} expat tcl
+%description -n lib%{namev}-modules
 Modules for the Zebra search engine.
 
-%package -n lib%{name}-devel
+%package -n lib%{namev}-devel
 Summary: Zebra development libraries
 Group: Development/Libraries
-Requires: lib%{name} = %{version} libyaz4-devel bzip2-devel 
-%description -n lib%{name}-devel
+Requires: lib%{namev} = %{version} libyaz4-devel bzip2-devel 
+%description -n lib%{namev}-devel
 Development libraries for the Zebra search engine.
 
 %prep
-%setup -n idzebra-%{version}
+%setup
 
 %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}
 
-%files
+%files -n %{namev}
 %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.*
 
-%files -n lib%{name}-modules
-/usr/lib/idzebra-2.0/modules/*
+%files -n lib%{namev}
+%{_libdir}/*.so.*
+
+%files -n lib%{namev}-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-*
+%files -n lib%{namev}-devel
+%{_bindir}/idzebra-config-*
+%{_includedir}/idzebra-2.0
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_mandir}/*/idzebra-config-*
 /usr/share/aclocal/*.m4