- updated to 2.03.10 (the last 2nd generation cluster release)

Changed files:
    dlm.spec -> 1.19

diff --git a/dlm.spec b/dlm.spec
index c9aa77ed635bfc5b82775d17b133c738a811843e..3ce00f0c72b83d9395b020fa77ae28f1c512aab4 100644 (file)
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,12 +1,12 @@
 Summary:       General-purpose distributed lock manager
 Summary(pl.UTF-8):     Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:          dlm
-Version:       2.00.00
+Version:       2.03.10
 Release:       1
-License:       LGPL v2+
+License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5: 2ef3f4ba9d3c87b50adfc9b406171085
+# Source0-md5: 379b560096e315d4b52e238a5c72ba4a
 URL:           http://sources.redhat.com/cluster/dlm/
 BuildRequires: perl-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,37 +49,39 @@ Statyczna biblioteka DLM.
 %prep
 %setup -q -n cluster-%{version}
 
-cd %{name}
-%{__perl} -pi -e 's/-g -O/%{rpmcflags}/' lib/Makefile
-
 %build
-cd %{name}
 ./configure \
+       --cc="%{__cc}" \
+       --cflags="%{rpmcflags} -Wall" \
+       --ldflags="%{rpmldflags}" \
        --incdir=%{_includedir} \
+       --ncursesincdir=%{_includedir}/ncurses \
        --libdir=%{_libdir} \
+       --libexecdir=%{_libdir} \
        --mandir=%{_mandir} \
        --prefix=%{_prefix} \
-       --sbindir=%{_sbindir}
+       --sbindir=%{_sbindir} \
+       --without_gfs \
+       --without_gfs2 \
+       --without_gnbd \
+       --without_kernel_modules
 
-%{__make} \
-       CC="%{__cc}" \
-       incdir=`pwd`/include
+%{__make} -C %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{name}
 install -d $RPM_BUILD_ROOT/%{_lib}
 
-%{__make} install \
+%{__make} -C %{name} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_includedir}/cluster
 
-mv $RPM_BUILD_ROOT%{_libdir}/libdlm.so.*.* $RPM_BUILD_ROOT/%{_lib}
+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}
+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
 
@@ -91,14 +93,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libdlm*.so.*.*
+%attr(755,root,root) /%{_lib}/libdlm.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libdlm.so.2
+%attr(755,root,root) /%{_lib}/libdlm_lt.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libdlm_lt.so.2
+%attr(755,root,root) %{_sbindir}/dlm_tool
+#/etc/udev/rules.d/51-dlm.rules
+%{_mandir}/man8/dlm_tool.8*
 
 %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
 %{_includedir}/libdlm.h
+%{_mandir}/man3/dlm_*.3*
+%{_mandir}/man3/libdlm.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libdlm*.a
+%{_libdir}/libdlm.a
+%{_libdir}/libdlm_lt.a