packages: sanlock/sanlock.spec, sanlock/sanlock-link.patch (NEW)=?UTF-8?Q?=20?=- updated ...

[qboosh]

Author: qboosh                       Date: Tue Mar  6 19:53:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.0
- added link patch to fix libsanlock linking
- added tmpfiles.d config

---- Files affected:
packages/sanlock:
   sanlock.spec (1.1 -> 1.2) , sanlock-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/sanlock/sanlock.spec
diff -u packages/sanlock/sanlock.spec:1.1 packages/sanlock/sanlock.spec:1.2
--- packages/sanlock/sanlock.spec:1.1	Fri Oct 21 18:08:19 2011
+++ packages/sanlock/sanlock.spec	Tue Mar  6 20:53:10 2012
@@ -3,12 +3,13 @@
 Summary:	Shared storage lock manager
 Summary(pl.UTF-8):	Zarządca blokad dla współdzielonego składowania danych
 Name:		sanlock
-Version:	1.8
+Version:	2.0
 Release:	0.1
 License:	LGPL v2+ (libsanlock_client, libwdmd), GPL v2 (libsanlock, utilities)
 Group:		Networking
 Source0:	https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
-# Source0-md5:	8d79874226981c43b658bd1e893aa87e
+# Source0-md5:	46fcb4be2aea8e5515d1f8ee86c68e13
+Patch0:		%{name}-link.patch
 URL:		https://fedorahosted.org/sanlock/
 BuildRequires:	gcc >= 5:3.4
 BuildRequires:	libaio-devel
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CFLAGS="%{rpmcflags}"
@@ -98,6 +100,12 @@
 install init.d/sanlock $RPM_BUILD_ROOT/etc/rc.d/init.d
 install init.d/wdmd $RPM_BUILD_ROOT/etc/rc.d/init.d
 
+install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+cat >$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/sanlock.conf <<EOF
+d /var/run/sanlock 0755 root root -
+d /var/run/wdmd 0755 root root -
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -111,6 +119,7 @@
 %attr(755,root,root) %{_sbindir}/wdmd
 %attr(754,root,root) /etc/rc.d/init.d/sanlock
 %attr(754,root,root) /etc/rc.d/init.d/wdmd
+/usr/lib/tmpfiles.d/sanlock.conf
 %dir /var/run/sanlock
 %dir /var/run/wdmd
 %{_mandir}/man8/sanlock.8*
@@ -144,5 +153,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/03/06 19:53:10  qboosh
+- updated to 2.0
+- added link patch to fix libsanlock linking
+- added tmpfiles.d config
+
 Revision 1.1  2011/10/21 16:08:19  qboosh
 - new

================================================================
Index: packages/sanlock/sanlock-link.patch
diff -u /dev/null packages/sanlock/sanlock-link.patch:1.1
--- /dev/null	Tue Mar  6 20:53:16 2012
+++ packages/sanlock/sanlock-link.patch	Tue Mar  6 20:53:10 2012
@@ -0,0 +1,11 @@
+--- sanlock-2.0/src/Makefile.orig	2012-03-02 22:13:24.000000000 +0100
++++ sanlock-2.0/src/Makefile	2012-03-06 20:11:32.466180099 +0100
+@@ -84,7 +84,7 @@
+ all: $(LIBSO_ENTIRE_TARGET) $(LIBSO_CLIENT_TARGET) $(CMD_TARGET)
+ 
+ $(LIBSO_ENTIRE_TARGET): $(LIB_ENTIRE_SOURCE)
+-	$(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^
++	$(CC) $(CFLAGS) $(LIB_ENTIRE_LDFLAGS) -shared -fPIC -o $@ -Wl,-soname=$(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $^ -lblkid -laio -lrt
+ 	ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so
+ 	ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so.$(SOMAJOR)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sanlock/sanlock.spec?r1=1.1&r2=1.2&f=u