Merge branch 'master' into normal_cql

[yaz-moved-to-github.git] / yaz.spec

diff --git a/yaz.spec b/yaz.spec
index db6c5ef..8939cf4 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,17 +1,19 @@
 # This file is part of the YAZ toolkit
-# Copyright (C) 1995-2011 Index Data
+# Copyright (C) 1995-2013 Index Data
 #
 # spec file for YAZ
 
+%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
+Name: yaz
+Summary: Z39.50 Programs
+Version: %{idmetaversion}
+Release: 1indexdata
+
 # determine system
 %define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
-%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
-%define is_suse11 %(grep 'VERSION = 11' /etc/SuSE-release >/dev/null && echo 1 || echo 0)
+%define is_suse %(test -e /etc/SuSE-release >/dev/null && echo 1 || echo 0)
+%define is_suse11 %(grep 'VERSION = 11' /etc/SuSE-release >/dev/null 2>&1 && echo 1 || echo 0)
 %define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
-Summary: Z39.50 Programs
-Name: yaz
-Version: 4.1.2
-Release: 1
 Requires: libxslt, gnutls, readline, libyaz4 = %{version}
 License: BSD
 Group: Applications/Internet
@@ -100,8 +102,7 @@ make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
-make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
-       libdir=${RPM_BUILD_ROOT}/%{_libdir} install
+make install DESTDIR=${RPM_BUILD_ROOT}
 rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 
 %clean
@@ -116,8 +117,10 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_bindir}/yaz-marcdump
 %{_bindir}/yaz-iconv
 %{_bindir}/yaz-json-parse
+%{_bindir}/yaz-url
 %{_mandir}/man1/yaz-client.*
 %{_mandir}/man1/yaz-json-parse.*
+%{_mandir}/man1/yaz-url.*
 %{_mandir}/man8/yaz-ztest.*
 %{_mandir}/man1/zoomsh.*
 %{_mandir}/man1/yaz-marcdump.*