X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=dmapi.spec;h=e6d7dd5d492478fc18e176a3f5ac98506359253f;hb=HEAD;hp=44f86e4d4b95144705b20956d68e848a042f427a;hpb=5c7a116b7515c28aa2b862ad2e2912801957ef4a;p=packages%2Fdmapi.git

diff --git a/dmapi.spec b/dmapi.spec
index 44f86e4..e6d7dd5 100644
--- a/dmapi.spec
+++ b/dmapi.spec
@@ -1,15 +1,16 @@
 Summary:	DMAPI library
 Summary(pl.UTF-8):	Biblioteka DMAPI
 Name:		dmapi
-Version:	2.2.8
-Release:	1
-License:	LGPL/GPL
+Version:	2.2.12
+Release:	3
+# doc/COPYING mentions LGPL for files in "dmapi", but all sources are explicitly marked GPL
+License:	GPL v2
 Group:		Libraries
-Source0:	ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}_%{version}-1.tar.gz
-# Source0-md5:	29c5ba7d9a3524fd247be00c3b43e8d9
+Source0:	ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
+# Source0-md5:	cd825d4e141c16011367e0a0dd98c9c5
 Patch0:		%{name}-miscfix.patch
 URL:		http://oss.sgi.com/projects/xfs/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	sed >= 4.0
 BuildRequires:	xfsprogs-devel >= 2.6.13
@@ -42,7 +43,7 @@ Summary:	Header files for DMAPI library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki DMAPI
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	xfsprogs-devel
+Requires:	xfsprogs-devel >= 2.6.13
 
 %description devel
 Header files required to develop software which uses DMAPI.
@@ -68,7 +69,7 @@ Statyczna wersja biblioteki DMAPI.
 %patch0 -p1
 
 %build
-rm -f aclocal.m4
+%{__rm} aclocal.m4
 %{__aclocal} -I m4
 %{__autoconf}
 %configure \
@@ -90,12 +91,14 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV
 %{__make} install-dev \
 	DIST_MANIFEST=$DIST_INSTALL_DEV
 
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/libdm.so
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} ; echo libdm.so.*.*.*) \
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/libdm.so
+ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libdm.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libexecdir}/libdm.so
 %{__sed} -i "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
 	$RPM_BUILD_ROOT%{_libexecdir}/libdm.la
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libdm.{so,la,a}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,16 +108,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 # COPYING specifies which parts are on LGPL/GPL
-%doc doc/{CHANGES,COPYING}
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc README doc/{CHANGES,COPYING}
+%attr(755,root,root) %{_libdir}/libdm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdm.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/lib*.so
-%{_libexecdir}/lib*.la
-%{_includedir}/xfs/*
-%{_mandir}/man3/*
+%attr(755,root,root) %{_libexecdir}/libdm.so
+%{_libexecdir}/libdm.la
+%{_includedir}/xfs/dmapi.h
+%{_mandir}/man3/dmapi.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/lib*.a
+%{_libexecdir}/libdm.a