[packages/drbdmanage] Closer to finished

mmazur mmazur at pld-linux.org
Tue Aug 2 16:25:31 CEST 2016


commit 4688758e3ff2396a74a5f53a99887156eb61f9cb
Author: Mariusz Mazur <mmazur at axeos.com>
Date:   Tue Aug 2 16:17:11 2016 +0200

    Closer to finished

 drbdmanage.spec               | 29 ++++++++++++++++++++++++++---
 drbdmanaged_service_fix.patch | 12 ++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/drbdmanage.spec b/drbdmanage.spec
index e30eb4d..455a6db 100644
--- a/drbdmanage.spec
+++ b/drbdmanage.spec
@@ -1,11 +1,12 @@
 Summary:	DRBD9 distributed resource management utility
 Name:		drbdmanage
 Version:	0.97
-Release:	0.3
+Release:	0.5
 License:	GPL v3
 Group:		Applications/System
 Source0:	https://www.drbd.org/download/drbdmanage/%{name}-%{version}.tar.gz
 # Source0-md5:	3c248e2914bf23abefe1ed7c98498ab6
+Patch0:     drbdmanaged_service_fix.patch
 URL:		http://oss.linbit.com/drbdmanage
 BuildRequires:	python-modules
 BuildRequires:	python-setuptools
@@ -24,20 +25,38 @@ configuration on the participating machines. It creates/deletes the
 backing LVM volumes. It automatically places the backing LVM volumes
 among the participating machines.
 
+%package -n bash-completion-drbdmanage
+Summary:    Bash completion for drbdmanage command
+Group:      Applications/Shells
+Requires:   %{name} = %{version}-%{release}
+Requires:   bash-completion
+
+%description -n bash-completion-drbdmanage
+Bash completion for drbdmanage command.
+
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
-%py_build
+%{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/lib/drbd.d
 %py_install
 %py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%systemd_post drbdmanaged.{service,socket}
+
+%preun
+%systemd_preun drbdmanaged.{service,socket}
+
 %files
 %defattr(644,root,root,755)
 %doc README
@@ -54,7 +73,11 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitescriptdir}/drbdmanage_client.py[co]
 %{py_sitescriptdir}/drbdmanage_server.py[co]
 %{py_sitescriptdir}/drbdmanage-%{version}-py*.egg-info
+%attr(750,root,root) /var/lib/drbd.d
+%{_mandir}/man8/drbdmanage-*
+%{_mandir}/man8/drbdmanage.*
 %dir %{_localstatedir}/lib/drbdmanage
 
-# bash-completion package
+%files -n bash-completion-drbdmanage
+%defattr(644,root,root,755)
 /etc/bash_completion.d/drbdmanage
diff --git a/drbdmanaged_service_fix.patch b/drbdmanaged_service_fix.patch
new file mode 100644
index 0000000..af14c48
--- /dev/null
+++ b/drbdmanaged_service_fix.patch
@@ -0,0 +1,12 @@
+--- drbdmanage-0.97/conf/drbdmanaged.service~	2016-06-27 10:33:00.000000000 +0200
++++ drbdmanage-0.97/conf/drbdmanaged.service	2016-08-02 16:11:50.007431964 +0200
+@@ -6,8 +6,8 @@
+ [Service]
+ ExecStart=/usr/bin/dbus-drbdmanaged-service
+ User=root
++PrivateTmp=yes
+ 
+ [Install]
+ WantedBy=multi-user.target
+ 
+-PrivateTmp=yes
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/drbdmanage.git/commitdiff/4688758e3ff2396a74a5f53a99887156eb61f9cb



More information about the pld-cvs-commit mailing list