X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdmapi.git;a=blobdiff_plain;f=dmapi.spec;h=e6d7dd5d492478fc18e176a3f5ac98506359253f;hp=d6e1cdc4f39f4959a22c32d2eba4f0cc80c9e418;hb=HEAD;hpb=31008c2af960eaa5b06a3608ec7b2960f1f1370c

diff --git a/dmapi.spec b/dmapi.spec
index d6e1cdc..e6d7dd5 100644
--- a/dmapi.spec
+++ b/dmapi.spec
@@ -1,21 +1,23 @@
 Summary:	DMAPI library
-Summary(pl):	Biblioteka DMAPI
+Summary(pl.UTF-8):	Biblioteka DMAPI
 Name:		dmapi
-Version:	2.0.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/download/cmd_tars/%{name}-%{version}.src.tar.gz
-# Source0-md5:	a8e2aef7a50a161b92ee30a300f84b4e
+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:	xfsprogs-devel >= 2.0.0
+BuildRequires:	sed >= 4.0
+BuildRequires:	xfsprogs-devel >= 2.6.13
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_libdir		/lib
-%define		_libexecdir	/usr/lib
+%define		_libdir		/%{_lib}
+%define		_libexecdir	/usr/%{_lib}
 
 %description
 DMAPI, or XDSM, is an implementation of the X/Open document: Systems
@@ -27,47 +29,47 @@ See the XDSM manual at
 http://www.opengroup.org/onlinepubs/9657099/toc.htm for a description
 of the functions offered by libdm library.
 
-%description -l pl
+%description -l pl.UTF-8
 DMAPI (albo XDSM) to implementacja dokumentu X/Open "Systems
 Management: Data Storage Management (XDSM) API) z lutego 1997. Ten
-interfejs jest dostêpny dla systemu plików XFS poprzez bibliotekê
+interfejs jest dostępny dla systemu plików XFS poprzez bibliotekę
 libdm.
 
-Opis funkcji oferowanych przez bibliotekê libdm jest w podrêczniku:
+Opis funkcji oferowanych przez bibliotekę libdm jest w podręczniku:
 http://www.opengroup.org/onlinepubs/9657099/toc.htm
 
 %package devel
 Summary:	Header files for DMAPI library
-Summary(pl):	Pliki nag³ówkowe biblioteki DMAPI
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki DMAPI
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
-Requires:	xfsprogs-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	xfsprogs-devel >= 2.6.13
 
 %description devel
 Header files required to develop software which uses DMAPI.
 
-%description devel -l pl
-Pliki nag³ówkowe potrzebne do tworzenia oprogramowania u¿ywaj±cego
+%description devel -l pl.UTF-8
+Pliki nagłówkowe potrzebne do tworzenia oprogramowania używającego
 DMAPI.
 
 %package static
 Summary:	Static DMAPI library
-Summary(pl):	Statyczna biblioteka DMAPI
+Summary(pl.UTF-8):	Statyczna biblioteka DMAPI
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static version of DMAPI library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna wersja biblioteki DMAPI.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
-rm -f aclocal.m4
+%{__rm} aclocal.m4
 %{__aclocal} -I m4
 %{__autoconf}
 %configure \
@@ -89,29 +91,34 @@ 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
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %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