X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yazpp.spec;h=cd813fc501a67f2b96e7baae9ca6a8f0d4755a56;hb=703a05988ba7d2085d1198440a60a601f8a3904c;hp=0f9e02513977c99839b49aea726b32f4e2b266cb;hpb=616b106aafc7f5cf6a838ab73dd8f6ddc4f14513;p=yazpp-moved-to-github.git

diff --git a/yazpp.spec b/yazpp.spec
index 0f9e025..cd813fc 100644
--- a/yazpp.spec
+++ b/yazpp.spec
@@ -1,6 +1,7 @@
+%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
 Summary: YAZ++ package (main)
 Name: yazpp
-Version: 1.2.7
+Version: %{idmetaversion}
 Release: 1indexdata
 License: BSD
 Group: Applications/Internet
@@ -15,20 +16,21 @@ URL: http://www.indexdata.com/yazplusplus
 %description
 YAZ++ package.
 
-%package -n libyazpp4
+%package -n libyazpp5
 Summary: YAZ++ and ZOOM library
 Group: Libraries
 Requires: libyaz4 >= 4.2.8
 
-%description -n libyazpp4
+%description -n libyazpp5
 Libraries for the YAZ++ package.
 
-%package -n libyazpp4-devel
+%package -n libyazpp5-devel
 Summary: Z39.50 Library - development package
 Group: Development/Libraries
-Requires: libyazpp4 = %{version}, libyaz4-devel
+Requires: libyazpp5 = %{version}, libyaz4-devel
+Conflicts: libyazpp4-devel
 
-%description -n libyazpp4-devel
+%description -n libyazpp5-devel
 Development libraries and include files for the YAZ++ package.
 
 %prep
@@ -43,22 +45,21 @@ 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
 rm -fr ${RPM_BUILD_ROOT}
 
-%post -n libyazpp4 -p /sbin/ldconfig 
-%postun -n libyazpp4 -p /sbin/ldconfig 
+%post -n libyazpp5 -p /sbin/ldconfig 
+%postun -n libyazpp5 -p /sbin/ldconfig 
 
-%files -n libyazpp4
+%files -n libyazpp5
 %doc README LICENSE NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 
-%files -n libyazpp4-devel
+%files -n libyazpp5-devel
 %defattr(-,root,root)
 %{_bindir}/yazpp-config
 %{_includedir}/yazpp