[drbdlinks] Upgrade to 1.22

[Robert Scheck]

commit 63e83da28e1980a4027e7ad49e6f5b11c40192cb
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 19 01:33:31 2012 +0200

    Upgrade to 1.22

 .gitignore         |    2 +-
 drbdlinks.spec     |   37 ++++++++++++++-----------------------
 drbdlinks.tmpfiles |    2 --
 drbdlinksclean     |    6 ++++--
 sources            |    2 +-
 5 files changed, 20 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6900b4..6c49c39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-drbdlinks-1.20.tar.gz
+drbdlinks-1.22.tar.gz
diff --git a/drbdlinks.spec b/drbdlinks.spec
index f28a7ae..828d12e 100644
--- a/drbdlinks.spec
+++ b/drbdlinks.spec
@@ -1,14 +1,13 @@
 Summary:         A program for managing links into a DRBD shared partition
 Name:            drbdlinks
-Version:         1.20
-Release:         3%{?dist}
+Version:         1.22
+Release:         1%{?dist}
 License:         GPLv2
 Group:           Applications/System
 URL:             http://www.tummy.com/Community/software/%{name}/
 Source0:         ftp://ftp.tummy.com/pub/tummy/%{name}/%{name}-%{version}.tar.gz
 Source1:         drbdlinksclean
 Source2:         drbdlinks.logrotate
-Source3:         drbdlinks.tmpfiles
 Requires:        python
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -40,24 +39,15 @@ partition isn't mounted, the links are in their normal state.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Create the needed directories
-mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/{ha.d/resource.d,rc.d/init.d},%{_mandir}/man8}
-mkdir -p $RPM_BUILD_ROOT{%{_sbindir},%{_localstatedir}/run/%{name}/configs-to-clean}
-
-# Install the files and symlinks
-install -p -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install -D -p -m 755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
+mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/ha.d/resource.d,/usr/lib/ocf/resource.d/tummy}
 ln -s ../../..%{_sbindir}/%{name} $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/%{name}
-install -p -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/drbdlinksclean
-install -p -m 644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
-
-# Install logrotate extension
+ln -s ../../../../..%{_sbindir}/%{name} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/tummy/%{name}
+install -D -p -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/drbdlinksclean
+install -D -p -m 644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
-
-# Install tmpfiles configuration
-%if 0%{?fedora} >= 15
-install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/configs-to-clean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,15 +67,16 @@ fi
 %{_sysconfdir}/rc.d/init.d/drbdlinksclean
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%if 0%{?fedora} >= 15
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
 %{_sbindir}/%{name}
 %{_sysconfdir}/ha.d/
+/usr/lib/ocf/resource.d/tummy/
 %{_mandir}/man8/%{name}.8*
-%{_localstatedir}/run/%{name}/
+%{_localstatedir}/lib/%{name}/
 
 %changelog
+* Thu Jul 19 2012 Robert Scheck <robert at fedoraproject.org> 1.22-1
+- Upgrade to 1.22
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/drbdlinksclean b/drbdlinksclean
index fd5a2e6..981c066 100644
--- a/drbdlinksclean
+++ b/drbdlinksclean
@@ -27,7 +27,7 @@ drbdlinks=/usr/sbin/drbdlinks
 
 [ -f /etc/drbdlinks.conf ] && FOUNDFILE=1
 
-for FILE in /var/run/drbdlinks/configs-to-clean/*; do
+for FILE in /var/lib/drbdlinks/configs-to-clean/* /var/run/drbdlinks/configs-to-clean/*; do
 	if [ -f "$FILE" ]; then
 		FOUNDFILE=1
 		break
@@ -51,13 +51,15 @@ case "$1" in
 				RETVAL=$?
 			else
 				echo "No mountpoint found in /etc/drbdlinks.conf, skipping."
+				echo "No mountpoint found in /etc/drbdlinks.conf, skipping." | logger -t drbdlinksclean
 			fi
 		fi
 
 		#  clean up any supplemental config files
-		for FILE in /var/run/drbdlinks/configs-to-clean/*; do
+		for FILE in /var/lib/drbdlinks/configs-to-clean/* /var/run/drbdlinks/configs-to-clean/*; do
 			if [ -f "$FILE" ]; then
 				echo -n "Cleaning up '${FILE##*/}' links..."
+				echo "Cleaning up '${FILE##*/}' links..." | logger -t drbdlinksclean
 				$drbdlinks --config-file "$FILE" stop || RETVAL=$?
 			fi
 		done
diff --git a/sources b/sources
index 24c9eec..9a39ffa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d706d049d028bbdb94d2c95fc782f139  drbdlinks-1.20.tar.gz
+e9e0502bb1b3b2be6a3e76e6310b7737  drbdlinks-1.22.tar.gz