X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dlm.spec;h=87788d643b48b0825358cdb227706b564a5dbcea;hb=6191feeb5cd42f99072fb0af62cd46ab5067f1d9;hp=6db8174b868371d96eb7271feeeeaf230888e18d;hpb=4df83c0fe35bb26f92e013f2e8922372d24ee137;p=packages%2Fdlm.git

diff --git a/dlm.spec b/dlm.spec
index 6db8174..87788d6 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,20 +1,16 @@
 Summary:	General-purpose distributed lock manager
-Summary(pl):	Zarz±dca rozproszonych blokad ogólnego przeznaczenia
+Summary(pl.UTF-8):	Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:		dlm
-%define	_pre	pre21
-Version:	1.0
-Release:	0.%{_pre}.3
-License:	LGPL v2+
+Version:	3.99.5
+Release:	2
+License:	LGPL v2.1+, GPL v2
 Group:		Libraries
-Source0:	http://people.redhat.com/cfeist/cluster/tgz/%{name}-%{version}-%{_pre}.tar.gz
-# Source0-md5:	37d5b471549af746ff93af7cac3b5a55
-# from dlm-kernel CVS
-Source1:	%{name}.h
-# NoSource1-md5: 3a0b53233a22384762742d9b3b277969 (rev 1.12)
-Source2:	%{name}_device.h
-# NoSource2-md5: f2c1ed74c31b43b13581c48b1834e3c2 (rev 1.4)
+Source0:	http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
+# Source0-md5:	cad4999d0c42000bf5898af34f587728
+Patch0:		%{name}-link_order.patch
 URL:		http://sources.redhat.com/cluster/dlm/
-BuildRequires:	perl-base
+BuildRequires:	corosync-devel
+Obsoletes:	cluster-dlm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -22,91 +18,97 @@ The DLM lock manager is a kernel-based VMS-like distributed lock
 manager. It is general purpose and not specific to only GFS or CLVM.
 Kernel and userspace locking API's are available.
 
-%description -l pl
-Zarz±dca blokad DLM to oparty na j±drze zarz±dca rozproszonych blokad
-w stylu VMS. Jest ogólnego przeznaczenia, przeznaczonym nie tylko dla
-GFS-a czy CLVM-a. Dostêpne s± API blokowania w j±drze i przestrzeni
-u¿ytkownika.
+%description -l pl.UTF-8
+Zarządca blokad DLM to oparty na jądrze zarządca rozproszonych blokad
+w stylu VMS. Jest ogólnego przeznaczenia, przeznaczonym nie tylko dla
+GFS-a czy CLVM-a. Dostępne są API blokowania w jądrze i przestrzeni
+użytkownika.
 
-%package devel
-Summary:	Header files and development documentation for DLM
-Summary(pl):	Pliki nag³ówkowe i dokumentacja programisty dla DLM-a
+%package libs
+Summary:	DLM libraries
+Summary(pl.UTF-8):	Biblioteki DLM
 Group:		Development/Libraries
+Obsoletes:	cluster-dlm-libs
 Requires:	%{name} = %{version}-%{release}
 
-%description devel
-Header files and development documentation for DLM.
+%description libs
+DLM libraries.
 
-%description devel -l pl
-Pliki nag³ówkowe i dokumentacja programisty dla DLM-a.
+%description libs -l pl.UTF-8
+Biblioteki DLM.
 
-%package static
-Summary:	Static DLM library
-Summary(pl):	Statyczna biblioteka DLM
+%package devel
+Summary:	Header files and development documentation for DLM
+Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja programisty dla DLM-a
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Obsoletes:	cluster-dlm-devel
+Requires:	%{name}-libs = %{version}-%{release}
 
-%description static
-Static DLM library.
+%description devel
+Header files and development documentation for DLM.
 
-%description static -l pl
-Statyczna biblioteka DLM.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 
 %prep
-%setup -q -n %{name}-%{version}-%{_pre}
-
-install -d include/cluster
-cp -f %{SOURCE1} %{SOURCE2} include/cluster
-
-%{__perl} -pi -e 's/-g -O/%{rpmcflags}/' lib/Makefile
+%setup -q
+%patch0 -p1
 
 %build
-./configure \
-	--incdir=%{_includedir} \
-	--libdir=%{_libdir} \
-	--mandir=%{_mandir} \
-	--prefix=%{_prefix} \
-	--sbindir=%{_sbindir}
-
 %{__make} \
-	CC="%{__cc}" \
-	incdir=`pwd`/include
+	PREFIX=%{_prefix} \
+	LIBNUM=%{_lib} \
+	BINDIR=%{_sbindir} \
+	LIBDIR=%{_libdir} \
+	MANDIR=%{_mandir} \
+	HDRDIR=%{_includedir} \
+	CC="%{__cc} %{rpmcflags} %{rpmcppflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_lib}
-
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_includedir}/cluster
-install include/cluster/*.h $RPM_BUILD_ROOT%{_includedir}/cluster
+	DESTDIR=$RPM_BUILD_ROOT \
+	PREFIX=%{_prefix} \
+	LIBNUM=%{_lib} \
+	BINDIR=%{_sbindir} \
+	LIBDIR=%{_libdir} \
+	MANDIR=%{_mandir} \
+	HDRDIR=%{_includedir}
 
-mv $RPM_BUILD_ROOT%{_libdir}/libdlm.so.*.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libdlm.so.*.*) \
-        $RPM_BUILD_ROOT%{_libdir}/libdlm.so
-
-mv $RPM_BUILD_ROOT%{_libdir}/libdlm_lt.so.*.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libdlm_lt.so.*.*) \
-        $RPM_BUILD_ROOT%{_libdir}/libdlm_lt.so
+install init/%{name}.service $RPM_BUILD_ROOT%{systemdunitdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libdlm*.so.*.*
+%doc README.license
+%attr(755,root,root) %{_sbindir}/*
+/lib/udev/rules.d/51-dlm.rules
+%{_mandir}/man8/*.8*
+%{_mandir}/man5/dlm.conf.5*
+
+%files libs
+%defattr(644,root,root,755)
+%ghost %{_libdir}/libdlm.so.3
+%attr(755,root,root) %{_libdir}/libdlm.so.3.*
+%ghost %{_libdir}/libdlm_lt.so.3
+%attr(755,root,root) %{_libdir}/libdlm_lt.so.3.*
+%ghost %{_libdir}/libdlmcontrol.so.3
+%attr(755,root,root) %{_libdir}/libdlmcontrol.so.3.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/*.txt
-%attr(755,root,root) %{_libdir}/libdlm*.so
+%attr(755,root,root) %{_libdir}/libdlm.so
+%attr(755,root,root) %{_libdir}/libdlm_lt.so
+%attr(755,root,root) %{_libdir}/libdlmcontrol.so
 %{_includedir}/libdlm.h
-%{_includedir}/cluster
+%{_includedir}/libdlmcontrol.h
+%{_mandir}/man3/dlm_*.3*
+%{_mandir}/man3/libdlm.3*
+%{_pkgconfigdir}/libdlm.pc
+%{_pkgconfigdir}/libdlm_lt.pc
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libdlm*.a