Version: 3.99.5

Finally without the cman/openais dependency.

diff --git a/dlm-link_order.patch b/dlm-link_order.patch
new file mode 100644 (file)
index 0000000..908f895
--- /dev/null
+++ b/dlm-link_order.patch
@@ -0,0 +1,66 @@
+diff -dur dlm-3.99.5.orig/dlm_controld/Makefile dlm-3.99.5/dlm_controld/Makefile
+--- dlm-3.99.5.orig/dlm_controld/Makefile      2012-06-21 23:53:56.000000000 +0200
++++ dlm-3.99.5/dlm_controld/Makefile   2012-10-25 10:04:07.000000000 +0200
+@@ -62,10 +62,10 @@
+ all: $(LIB_TARGET) $(BIN_TARGET)
+ 
+ $(BIN_TARGET): $(BIN_SOURCE)
+-      $(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) $(BIN_SOURCE) -o $@ -L.
++      $(CC) $(BIN_SOURCE) $(BIN_CFLAGS) $(BIN_LDFLAGS) -o $@ -L.
+ 
+ $(LIB_TARGET): $(LIB_SOURCE)
+-      $(CC) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_SMAJOR) $^
++      $(CC) $^ $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_SMAJOR)
+       ln -sf $(LIB_TARGET) $(LIB_SO)
+       ln -sf $(LIB_TARGET) $(LIB_SMAJOR)
+ 
+diff -dur dlm-3.99.5.orig/dlm_tool/Makefile dlm-3.99.5/dlm_tool/Makefile
+--- dlm-3.99.5.orig/dlm_tool/Makefile  2012-06-21 23:53:56.000000000 +0200
++++ dlm-3.99.5/dlm_tool/Makefile       2012-10-25 10:04:26.000000000 +0200
+@@ -39,7 +39,7 @@
+ all: $(BIN_TARGET)
+ 
+ $(BIN_TARGET): $(BIN_SOURCE)
+-      $(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) $(BIN_SOURCE) -o $@
++      $(CC) $(BIN_SOURCE) $(BIN_CFLAGS) $(BIN_LDFLAGS) -o $@
+ 
+ clean:
+       rm -f *.o *.so *.so.* $(BIN_TARGET)
+diff -dur dlm-3.99.5.orig/fence/Makefile dlm-3.99.5/fence/Makefile
+--- dlm-3.99.5.orig/fence/Makefile     2012-06-21 23:53:56.000000000 +0200
++++ dlm-3.99.5/fence/Makefile  2012-10-25 10:04:43.000000000 +0200
+@@ -40,7 +40,7 @@
+ all: $(BIN_TARGET)
+ 
+ $(BIN_TARGET): $(BIN_SOURCE)
+-      $(CC) $(BIN_CFLAGS) $(BIN_LDFLAGS) $(BIN_SOURCE) -o $@ -L.
++      $(CC) $(BIN_SOURCE) $(BIN_CFLAGS) $(BIN_LDFLAGS) -o $@ -L.
+ 
+ clean:
+       rm -f *.o *.so *.so.* $(BIN_TARGET)
+diff -dur dlm-3.99.5.orig/libdlm/Makefile dlm-3.99.5/libdlm/Makefile
+--- dlm-3.99.5.orig/libdlm/Makefile    2012-06-21 23:53:56.000000000 +0200
++++ dlm-3.99.5/libdlm/Makefile 2012-10-25 10:05:41.000000000 +0200
+@@ -86,18 +86,18 @@
+ all: $(LIB_TARGET) $(LLT_TARGET) $(LIB_PC) $(LLT_PC)
+ 
+ $(LIB_O): $(SOURCE) 
+-      $(CC) $(LIB_CFLAGS) -c -o $@ $<
++      $(CC) $< $(LIB_CFLAGS) -c -o $@
+ 
+ $(LLT_O): $(SOURCE) 
+-      $(CC) $(LLT_CFLAGS) -c -o $@ $<
++      $(CC) $< $(LLT_CFLAGS) -c -o $@
+ 
+ $(LIB_TARGET): $(LIB_O)
+-      $(CC) $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR) $^
++      $(CC) $^ $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR)
+       ln -sf $(LIB_TARGET) $(LIB_SO)
+       ln -sf $(LIB_TARGET) $(LIB_SMAJOR)
+ 
+ $(LLT_TARGET): $(LLT_O)
+-      $(CC) $(LLT_LDFLAGS) -shared -o $@ -Wl,-soname=$(LLT_SMAJOR) $^
++      $(CC) $^ $(LLT_LDFLAGS) -shared -o $@ -Wl,-soname=$(LLT_SMAJOR)
+       ln -sf $(LLT_TARGET) $(LLT_SO)
+       ln -sf $(LLT_TARGET) $(LLT_SMAJOR)
+ 

diff --git a/dlm.spec b/dlm.spec
index 5c47e901d18b45a0405157066906513c601d23b4..da7d2719d8afed4969e652800346b494d374c377 100644 (file)
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,14 +1,15 @@
 Summary:       General-purpose distributed lock manager
 Summary(pl.UTF-8):     Zarządca rozproszonych blokad ogólnego przeznaczenia
 Name:          dlm
-Version:       2.03.10
-Release:       2
-License:       LGPL v2.1+
+Version:       3.99.5
+Release:       0.1
+License:       LGPL v2.1+, GPL v2
 Group:         Libraries
-Source0:       ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5: 379b560096e315d4b52e238a5c72ba4a
+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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -22,11 +23,23 @@ 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 libs
+Summary:       DLM libraries
+Summary(pl.UTF-8):     Biblioteki DLM
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description libs
+DLM libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki 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} = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
 Header files and development documentation for DLM.
@@ -34,57 +47,31 @@ Header files and development documentation for DLM.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe i dokumentacja programisty dla DLM-a.
 
-%package static
-Summary:       Static DLM library
-Summary(pl.UTF-8):     Statyczna biblioteka DLM
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static DLM library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka DLM.
-
 %prep
-%setup -q -n cluster-%{version}
+%setup -q
+%patch0 -p1
 
 %build
-./configure \
-       --cc="%{__cc}" \
-       --cflags="%{rpmcflags} -Wall" \
-       --ldflags="%{rpmldflags}" \
-       --incdir=%{_includedir} \
-       --ncursesincdir=%{_includedir}/ncurses \
-       --libdir=%{_libdir} \
-       --libexecdir=%{_libdir} \
-       --mandir=%{_mandir} \
-       --prefix=%{_prefix} \
-       --sbindir=%{_sbindir} \
-       --without_gfs \
-       --without_gfs2 \
-       --without_gnbd \
-       --without_kernel_modules \
-       --disable_kernel_check
-
-%{__make} -C %{name}
+%{__make} \
+       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} -C %{name} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_includedir}/cluster
+%{__make} install \
+       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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,24 +81,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%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*
+%doc README.license
+%attr(755,root,root) %{_sbindir}/*
+/lib/udev/rules.d/51-dlm.rules
+%{_mandir}/man8/*.8*
+%{_mandir}/man5/dlm.conf.5.gz
+
+%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_lt.so
+%attr(755,root,root) %{_libdir}/libdlmcontrol.so
 %{_includedir}/libdlm.h
+%{_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
-%{_libdir}/libdlm_lt.a